diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java
index 0efbc866a8..8e101be7ac 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java
@@ -122,7 +122,9 @@ public class UpsertIngestionSourceResolver implements DataFetcher<CompletableFut
     if (input.getExecutorId() != null) {
       result.setExecutorId(input.getExecutorId());
     }
-    result.setDebugMode(input.getDebugMode());
+    if (input.getDebugMode() != null) {
+      result.setDebugMode(input.getDebugMode());
+    }
     return result;
   }
 
diff --git a/datahub-graphql-core/src/main/resources/ingestion.graphql b/datahub-graphql-core/src/main/resources/ingestion.graphql
index 8a8c929bb7..cdf6d70957 100644
--- a/datahub-graphql-core/src/main/resources/ingestion.graphql
+++ b/datahub-graphql-core/src/main/resources/ingestion.graphql
@@ -467,7 +467,7 @@ input UpdateIngestionSourceConfigInput {
   """
   Whether or not to run ingestion in debug mode
   """
-  debugMode: Boolean!
+  debugMode: Boolean
 }
 
 """
diff --git a/smoke-test/tests/tests/data.json b/smoke-test/tests/tests/data.json
index bc1298b8ad..b91c9d9f0e 100644
--- a/smoke-test/tests/tests/data.json
+++ b/smoke-test/tests/tests/data.json
@@ -148,7 +148,7 @@
     "changeType": "UPSERT",
     "aspectName": "testInfo",
     "aspect": {
-      "value": "{\"name\": \"Sample Test 1\", \"category\": \"Examples\", \"description\": \"An example of Metadata Test\", \"definition\": { \"type\": \"JSON\", \"json\": \"{}\"} }",
+      "value": "{\"name\": \"Sample Test 1\", \"category\": \"Examples\", \"description\": \"An example of Metadata Test\", \"definition\": { \"type\": \"JSON\", \"json\": \"{\\\"on\\\":{\\\"dataset\\\":[{\\\"query\\\":\\\"dataPlatformInstance.platform\\\",\\\"condition\\\":\\\"EQUALS\\\",\\\"values\\\":[\\\"urn:li:dataPlatform:bigQuery\\\"]}]},\\\"rules\\\":{\\\"or\\\":[{\\\"query\\\":\\\"glossaryTerms.terms.glossaryTermInfo.parentNode\\\",\\\"condition\\\":\\\"EQUALS\\\",\\\"values\\\":[\\\"urn:li:glossaryNode:Category\\\"]},{\\\"query\\\":\\\"container.container.glossaryTerms.terms.glossaryTermInfo.parentNode\\\",\\\"condition\\\":\\\"EQUALS\\\",\\\"values\\\":[\\\"urn:li:glossaryNode:Category\\\"]}]}}\"} }",
       "contentType": "application/json"
     },
     "systemMetadata": null
@@ -161,7 +161,7 @@
     "changeType": "UPSERT",
     "aspectName": "testInfo",
     "aspect": {
-      "value": "{\"name\": \"Sample Test 2\", \"category\": \"Examples\", \"description\": \"An example of another Metadata Test\", \"definition\": { \"type\": \"JSON\", \"json\": \"{}\"} }",
+      "value": "{\"name\": \"Sample Test 2\", \"category\": \"Examples\", \"description\": \"An example of another Metadata Test\", \"definition\": { \"type\": \"JSON\", \"json\": \"{\\\"on\\\":{\\\"dataset\\\":[{\\\"query\\\":\\\"dataPlatformInstance.platform\\\",\\\"condition\\\":\\\"EQUALS\\\",\\\"values\\\":[\\\"urn:li:dataPlatform:bigQuery\\\"]}]},\\\"rules\\\":{\\\"or\\\":[{\\\"query\\\":\\\"glossaryTerms.terms.glossaryTermInfo.parentNode\\\",\\\"condition\\\":\\\"EQUALS\\\",\\\"values\\\":[\\\"urn:li:glossaryNode:Category\\\"]},{\\\"query\\\":\\\"container.container.glossaryTerms.terms.glossaryTermInfo.parentNode\\\",\\\"condition\\\":\\\"EQUALS\\\",\\\"values\\\":[\\\"urn:li:glossaryNode:Category\\\"]}]}}\"} }",
       "contentType": "application/json"
     },
     "systemMetadata": null
diff --git a/smoke-test/tests/tests/tests_test.py b/smoke-test/tests/tests/tests_test.py
index e0c460feb6..0b87f90a92 100644
--- a/smoke-test/tests/tests/tests_test.py
+++ b/smoke-test/tests/tests/tests_test.py
@@ -1,7 +1,8 @@
 import pytest
+import tenacity
+from tests.utils import delete_urns_from_file, get_frontend_url, ingest_file_via_rest, wait_for_healthcheck_util, get_sleep_info
 
-from tests.utils import delete_urns_from_file, get_frontend_url, ingest_file_via_rest
-
+sleep_sec, sleep_times = get_sleep_info()
 
 @pytest.fixture(scope="module", autouse=True)
 def ingest_cleanup_data(request):
@@ -12,6 +13,11 @@ def ingest_cleanup_data(request):
     delete_urns_from_file("tests/tests/data.json")
 
 
+@pytest.fixture(scope="session")
+def wait_for_healthchecks():
+    wait_for_healthcheck_util()
+    yield
+
 @pytest.mark.dependency()
 def test_healthchecks(wait_for_healthchecks):
     # Call to wait_for_healthchecks fixture will do the actual functionality.
@@ -196,8 +202,10 @@ def test_update_test(frontend_session, wait_for_healthchecks):
     delete_test(frontend_session, test_urn)
 
 
-@pytest.mark.dependency(depends=["test_healthchecks", "test_update_test"])
-def test_list_tests(frontend_session, wait_for_healthchecks):
+@tenacity.retry(
+    stop=tenacity.stop_after_attempt(sleep_times), wait=tenacity.wait_fixed(sleep_sec)
+)
+def test_list_tests_retries(frontend_session):
     list_tests_json = {
         "query": """query listTests($input: ListTestsInput!) {\n
           listTests(input: $input) {\n
@@ -225,6 +233,11 @@ def test_list_tests(frontend_session, wait_for_healthchecks):
     assert "errors" not in res_data
 
 
+@pytest.mark.dependency(depends=["test_healthchecks", "test_update_test"])
+def test_list_tests(frontend_session, wait_for_healthchecks):
+    test_list_tests_retries(frontend_session)
+
+
 @pytest.mark.dependency(depends=["test_healthchecks"])
 def test_get_test_results(frontend_session, wait_for_healthchecks):
     urn = (