Cleaned up message store test. Perhaps it will work on Travis now?
Merge pull request #74 from jembi/fix-msg-store-tests

Cleaned up message store test. Perhaps it will work on Travis now?