Added test_map