Merge "TEST_MAPPING: add the rest of our actively maintained tests."