Fixed test and added new test map