Mockobject fixes

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

Closes #3579890

Merge request reports