coverage + tests
changes to client and server
changes to client and server