Also, some test refactoring and add servant-client to tests.
Attach a file by drag & drop or click to upload
