Added ApiClient and tests