Merge "TEST_MAPPING name must be CTS modules, not test names" into main