Mockobject fixes

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

Closes #3579870

Merge request reports