Cleaning up TODOs
- Ensuring that spec tests assert more of the defined Messages we have created