Refactor test cases
Support enum types by default