Add a sub to the client/server test and fix an exposed bug.