fix tests after refactoring