Added client
Added tests