Improve tests for tokenizer line increment