Refactor enums in test utils to make them more readable and to get rid
of unused code.