Fixed enums, with test