Cleared up a bit the test code, moved all the statics ...OneRun to a non-test class so that they can be used to print csv files from non-test classes