Add tests for Store class.
Some minor changes to the Store class.