add Enum validation & tests