Support "enum" + test
More consistent testing conventions