fixing tests after refactoring