[BZ 1069545] Update remaining unit and integration tests. The tests are heavily simplified because there is entity to handle subcategories. Subcategories are now just a field on the resource type so there is not much to test anymore.