Merge "Add missing TEST_MAPPING tests to relevant tracing modules" into main