DF-5129 add more tests