Fix tests

Adam Bramleyrequested to merge
issue/diff-3498660:3498660-8.x-1.x into 8.x-1.x

Closes #3498660

Merge request reports