fixed test, lexer update, all tests pass