Fix r.binary + test