Fix some tests after my last commit in r2