DF-291 fixes in autotesting