Adjust tests after refactoring