Fix the categories functional test to deal with the new uniqueness requirement