WIP on getting client tests to pass with new client classes