More r_io tests fixed!