Fix mocks for new understream