DF-291 fixes for AutotestingProject