Fix tests
(#655) - Fix bugs in map page