Merge "Add TEST_MAPPING."