VX(C): Refactor the categories for the unit tests.