Add api client classes and tests