Correct tokenizer behavior when dealing with multi-line comments and newlines. Add simple test case.