[#70792034] fix mocks and tests