Fixed yacc to pass tests again