finished converting client-server unit tests