refactoring
adjust tests