Codestyle: Category Coding (tests)

Change-Id: I7a982fe3ac2ea34b5795184b8ad66dd32f541ee1
Merge "Codestyle: Category Coding (tests)"