clean up test, convert enum to more ooc-lua-friendly format