Fix tests after refactoring