Fix test linkages

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

Merge request reports