Fix categories and images tests