Added map_tests