Fixes to test lex-auto