Lexer tag fix, and scaffolding for unit test