reversed csv column order and cleaned up the tests