[DF-5580] fix UnitTests