modifications to test with non-incremental lexer