Removed more obsolete crap.
Fixed benchmark test bad test case.
Fixed csvhelpers test wrong filename.