Merge "Adding a TEST_MAPPING file"