Fix up failing tests, whoops