refactor MapViewTest
fix implicit merge problem