Fix Store and StoreMap tests.