MockObject fixes

David Cameronrequested to merge
issue/drupal-3579172:3579172-mockobject-fixes into main

Closes #3579172

Merge request reports