category mapper was implemented, tests for models mapping was added