moved tests to MapStoreTest