Update tests with new server/client test harness