added binop tests and changed lex