Add "category" to builders, fakedb and unit tests.
This is a part of patch for ticket #993