NEXUS-6232: Adjusting mocks