Oops, also fix these other tests