Simplify matcher in MessageStoreSpec