Deleted client for move to separate repo
Updated tests so they pass