Fix test linkages

Merged Mark Andrews requested to merge fix-test-linkages-v9_11 into v9_11

Merge request reports