Cleanup lexer tests a bit