[DF-185] fix unit tests after refactoring