Refactored out some logic into new Datareader class
Adding refactor of DelimiterFinder
Fixed failing tests