fixed tests after refactorings