Merge "Add more tests to TEST_MAPPING."