diff --git a/Algorithmia/errors.py b/Algorithmia/errors.py
index 9356e24..f23662a 100644
--- a/Algorithmia/errors.py
+++ b/Algorithmia/errors.py
@@ -47,4 +47,4 @@ def raiseAlgoApiError(result):
             stacktrace = None
         return AlgorithmException(message=message, stack_trace=stacktrace, error_type=err_type)
     else:
-        return Exception(result)
+        return Exception("Non-Algorithm related Failure: " + str(result))
diff --git a/Test/algo_failure_test.py b/Test/algo_failure_test.py
index 1e65234..7defcc2 100644
--- a/Test/algo_failure_test.py
+++ b/Test/algo_failure_test.py
@@ -14,22 +14,14 @@
     from Test.api import app
 
 
-    def start_webserver():
-        uvicorn.run(app, host="127.0.0.1", port=8080, log_level="debug")
-
-
     class AlgoTest(unittest.TestCase):
         error_500 = Response()
         error_500.status_code = 500
+        error_message = "Non-Algorithm related Failure: " + str(error_500)
 
-        def setUp(self):
-            self.client = Algorithmia.client(api_address="http://localhost:8080")
-            self.uvi_p = Process(target=start_webserver)
-            self.uvi_p.start()
-            time.sleep(1)
-
-        def tearDown(self):
-            self.uvi_p.terminate()
+        @classmethod
+        def setUpClass(cls):
+            cls.client = Algorithmia.client(api_address="http://localhost:8080", api_key="simabcd123")
 
         def test_throw_500_error_HTTP_response_on_algo_request(self):
             try:
@@ -37,4 +29,4 @@ def test_throw_500_error_HTTP_response_on_algo_request(self):
             except Exception as e:
                 result = e
                 pass
-            self.assertEqual(str(self.error_500), str(result))
+            self.assertEqual(str(self.error_message), str(result))