Cleaned up Store and added tests.