Edit new_runtest
Merge conflict