Fix up ~r tests