MockObject fixes

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

Closes #3579136

Merge request reports