MapController with tests