Improve lexer tests