Updated mapName logic and corrected some test routing