More enum stuff, with tests.