Cleaned up map view controller & fixed failing test