fixed broken tests after refactoring