Merge "Fix error test path in TEST_MAPPING"