Mockobject fixes

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

Closes #3579883

Merge request reports