Amendments to PR #133

- Add initial stab at a test suite.
- Fixes hour constant.
- Fix ordinal for enum values.
- Fix enum names.