[DF-185] Fixed unit tests