Merge "Additional TEST_MAPPING files"