cleanup and improve unit tests for enum types