Misc test fixes#2520

dl3sdo wants to merge 3 commits into

OpenOrienteering:masterOpenOrienteering/mapper:masterfrom

dl3sdo:misc-test-fixesdl3sdo/mapper:misc-test-fixesCopy head branch name to clipboard