_Really_ fix these tests (probably).