CategoryManager and CategoryManagerTest with dql-fit

Refactored CategoryManager and CategoryManagerTest using "dql-fit".