refactored software tests finished
fix proper inventory filtering for software