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