[DF-185] Fixed UnitTests