Tidied up code, renamed RunBenchmark to RunCollectionTools, renamed CaliperBenchmarkTest to CaliperBenchmark