Add category test.
Fix merge conflicts.