Use factories instead of fixtures; fix many tests but not all