Let enum types implement EnumeratedValue

Letting the enum types implement EnumeratedValue makes them a bit simpler to use in tests, also we don't run into any problems should the enum constant names and the required string value differ.