DF-5198 update unit tests