Merge "Add explicit TEST_MAPPING files for tz detector tests"