Small bugfixes in MapService, Unit test added to MapService