made DI using mock work
refactored categories/values