Fix failing tests due to refactoring.