diff --git a/packages/syft/src/syft/util/test_helpers/apis/submit_query.py b/packages/syft/src/syft/util/test_helpers/apis/submit_query.py
index d58d030f834..ee53cd7e0b6 100644
--- a/packages/syft/src/syft/util/test_helpers/apis/submit_query.py
+++ b/packages/syft/src/syft/util/test_helpers/apis/submit_query.py
@@ -23,10 +23,10 @@ def submit_query(
             name=func_name,
             input_policy=sy.MixedInputPolicy(
                 endpoint=sy.Constant(
-                    val=context.admin_client.api.services.bigquery.test_query
+                    val=context.user_client.api.services.bigquery.test_query
                 ),
                 query=sy.Constant(val=query),
-                client=context.admin_client,
+                client=context.user_client,
             ),
             worker_pool_name=context.settings["user_code_worker"],
         )
diff --git a/packages/syft/src/syft/util/test_helpers/email_helpers.py b/packages/syft/src/syft/util/test_helpers/email_helpers.py
index 0efc41ffddf..950ced27375 100644
--- a/packages/syft/src/syft/util/test_helpers/email_helpers.py
+++ b/packages/syft/src/syft/util/test_helpers/email_helpers.py
@@ -132,8 +132,8 @@ def relogin(self) -> None:
 
     @client.setter
     def client(self, client):
-        client = client.login(email=self.email, password=self.latest_password)
-        self._client_cache = client
+        this_client = client.login(email=self.email, password=self.latest_password)
+        self._client_cache = this_client
 
     def to_dict(self) -> dict:
         output = {}