Converted enums and added tests.