fix unit tests;
fix catalog RequestMapping