Updated ServerClientTests in conjunction with edits made to methods in
that class.