Adding test case for map parser.
Cleaning up map parser.