categories, fix unit tests