[DF-1281] fix - UnitTest is added.
Merge remote-tracking branch 'DAVA/development' into development-DAVA