Fix new test errors coming from refactorings from rebased commits