diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_schedule.macros b/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_schedule.macros
index 34d649171..d33add20a 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_schedule.macros
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_schedule.macros
@@ -95,7 +95,7 @@ FROM
             jexscid, array_agg(jexid) AS jexid, array_agg(to_char(jexdate, 'YYYY-MM-DD')) AS jexdate,
             array_agg(jextime) AS jextime
         FROM
-            pgagent.pga_exception ex
+            (SELECT * FROM pgagent.pga_exception ORDER BY jexid) ex
         GROUP BY
             jexscid
     ) e ON s.jscid = e.jexscid
diff --git a/web/pgadmin/feature_tests/test_data.json b/web/pgadmin/feature_tests/test_data.json
index 416406739..bdbc428e7 100644
--- a/web/pgadmin/feature_tests/test_data.json
+++ b/web/pgadmin/feature_tests/test_data.json
@@ -29,7 +29,8 @@
     },
     "copy": {
       "1": [2, "2", "int"],
-      "2": ["1", "1", "int"]
+      "2": ["1", "1", "int"],
+      "5": ["\"\"", "", "text"]
     },
     "update": {
       "4": ["Hello World Again", "Hello World Again", "text"]
diff --git a/web/pgadmin/utils/route.py b/web/pgadmin/utils/route.py
index 35493e95d..a80310ebd 100644
--- a/web/pgadmin/utils/route.py
+++ b/web/pgadmin/utils/route.py
@@ -66,8 +66,10 @@ class TestsGeneratorRegistry(ABCMeta):
         all_modules = []
 
         all_modules += find_modules(pkg_root, False, True)
-        # Append reverse engineered test case module
-        all_modules.append('regression.re_sql.tests.test_resql')
+
+        if 'resql' not in exclude_pkgs:
+            # Append reverse engineered test case module
+            all_modules.append('regression.re_sql.tests.test_resql')
 
         # If specific modules are to be tested, exclude others
         # for modules are handled differently for resql
diff --git a/web/regression/README b/web/regression/README
index a4591acb2..46adfccda 100644
--- a/web/regression/README
+++ b/web/regression/README
@@ -190,6 +190,9 @@ Python Tests:
      Example 2)  Execute only reverse engineered SQL test framework for some modules
          run 'python runtests.py --pkg resql --modules sequences,functions'
 
+     Example 3) Exclude reverse engineered SQL test framework for all modules
+         run 'python runtests.py --exclude resql'
+
 Code Coverage:
 ---------------
 
diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py
index aef031fd0..d7e8fe395 100644
--- a/web/regression/feature_utils/pgadmin_page.py
+++ b/web/regression/feature_utils/pgadmin_page.py
@@ -271,7 +271,7 @@ class PgadminPage:
         self.click_element(object_menu_item)
         delete_menu_item = self.find_by_partial_link_text("Remove Server")
         self.click_element(delete_menu_item)
-        self.click_modal('OK')
+        self.click_modal('Yes')
 
     def select_tree_item(self, tree_item_text):
         item = self.find_by_xpath(