Adding updated untested mockadapter.
Adding untested client.