Mockobject fixes

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

Closes #3579854

Merge request reports