Merge the two testrunning scripts