Fix tests that Rusty broke