Initial Enhanced Map Test Suite