Test fixed, new tests for categories