Fix where the test harness gets its Tokenizer
CRLFs? Really?
Deal with newlines