[DF-3489] more randomization