Merge "Fix test name in test-mapping"