Added dedicated MapTest for more complete testing of Map.