mapstore tests completed. fixes where needed