Updated objects to use Enum types instead of byte.

All 135 tests pass.