Some lexer changes, new testcases