Add MockClient and Server tests