Merge "Move TEST_MAPPING out of tests/ subdirectory"