mini refactoring into two different classes

Conflicts:
	test/integration/run.rb
format the output to be more csv alike
more refactoring and output clean up to match csv format
fix separator in the csv format