Added map tests from actual test plan