Refactor store tests.
Merge pull request #260 from benbjohnson/clean-store-tests

Clean up store tests.