Add MockClient and Server tests
Resolve merge conflicts