Map tests
merged