Fix the map and change the test database