Modified Map Manager & added test_map