Mockobject fixes

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

Closes #3579868

Merge request reports