CHANGE: Add a new test
Moved to ResourceStatusSystem
Removed old SoftwareTagSystem
Changed all imports