fixing drafts of client-server integraton tests