MOB-1636: Fix map centering and unit tests