fixing unit tests after refactorings