diff --git a/tableauserverclient/server/request_factory.py b/tableauserverclient/server/request_factory.py
index 7e4038979..7313124af 100644
--- a/tableauserverclient/server/request_factory.py
+++ b/tableauserverclient/server/request_factory.py
@@ -877,7 +877,6 @@ def _generate_xml(
             views_element = ET.SubElement(workbook_element, "views")
             for view_name in workbook_item.hidden_views:
                 _add_hiddenview_element(views_element, view_name)
-
         return ET.tostring(xml_request)
 
     def update_req(self, workbook_item):
@@ -950,9 +949,9 @@ def embedded_extract_req(self, xml_request, include_all=True, datasources=None):
         list_element = ET.SubElement(xml_request, "datasources")
         if include_all:
             list_element.attrib["includeAll"] = "true"
-        else:
+        elif datasources:
             for datasource_item in datasources:
-                datasource_element = list_element.SubElement(xml_request, "datasource")
+                datasource_element = ET.SubElement(list_element, "datasource")
                 datasource_element.attrib["id"] = datasource_item.id
 
 
diff --git a/test/request_factory/__init__.py b/test/request_factory/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/request_factory/test_datasource_requests.py b/test/request_factory/test_datasource_requests.py
new file mode 100644
index 000000000..75bb535d5
--- /dev/null
+++ b/test/request_factory/test_datasource_requests.py
@@ -0,0 +1,15 @@
+import unittest
+import tableauserverclient as TSC
+import tableauserverclient.server.request_factory as TSC_RF
+from tableauserverclient import DatasourceItem
+
+
+class DatasourceRequestTests(unittest.TestCase):
+    def test_generate_xml(self):
+        datasource_item: TSC.DatasourceItem = TSC.DatasourceItem("name")
+        datasource_item.name = "a ds"
+        datasource_item.description = "described"
+        datasource_item.use_remote_query_agent = False
+        datasource_item.ask_data_enablement = DatasourceItem.AskDataEnablement.Enabled
+        datasource_item.project_id = "testval"
+        TSC_RF.RequestFactory.Datasource._generate_xml(datasource_item)
diff --git a/test/request_factory/test_workbook_requests.py b/test/request_factory/test_workbook_requests.py
new file mode 100644
index 000000000..797913614
--- /dev/null
+++ b/test/request_factory/test_workbook_requests.py
@@ -0,0 +1,14 @@
+import unittest
+import tableauserverclient as TSC
+import tableauserverclient.server.request_factory as TSC_RF
+
+
+class WorkbookRequestTests(unittest.TestCase):
+    def test_embedded_extract_req(self):
+        include_all = True
+        embedded_datasources = None
+        xml_result = TSC_RF.RequestFactory.Workbook.embedded_extract_req(include_all, embedded_datasources)
+
+    def test_generate_xml(self):
+        workbook_item: TSC.WorkbookItem = TSC.WorkbookItem("name", "project_id")
+        TSC_RF.RequestFactory.Workbook._generate_xml(workbook_item)