Fix tests following 3dd2f3e