Added more options for selecting multiple categories. Added more category tests