Introduced CategoryBuilder
Moved more tests to CategoryBuilder