checkpoint: s/BINOP+/BINOP-PLUS and s/BINOP*/BINOP-TIMES and the like to not confuse ragg grammar
fixing tests to have spaces around binops