Materials and Supplies tests should not include equipment

[timwis]

In fy17 proposed, these two major classes were combined. But it was not in fy 16 adopted, so we'll keep them separate unless Budget office says otherwise