Fix up test to use client objects in test fixtures