Still working on getting the message hashes to play nicely with tests.