refactoring
fix broken tests