Update category mapping in tests

Use the newer form of spelled-out category names in tests since
that's what we're writing in config files now.

Change-Id: Ib679e54b53131280956cbda20b84f5602a4953c8
4 files changed