Fix tokenizer line numbers; return test