Writing more tests for lexer/bug fixing in lexer