Mockobject fixes

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

Closes #3579897

Merge request reports