Mockobject fixes

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

Closes #3579905

Merge request reports