diff --git a/onadata/apps/main/tests/test_csv_export.py b/onadata/apps/main/tests/test_csv_export.py
index 86ad462165..868265bf82 100644
--- a/onadata/apps/main/tests/test_csv_export.py
+++ b/onadata/apps/main/tests/test_csv_export.py
@@ -67,11 +67,11 @@ def test_csv_nested_repeat_output(self):
         self.maxDiff = None
         data_dictionary = DataDictionary.objects.all()[0]
         xpaths = [
-            u'/double_repeat/bed_net[1]/member[1]/name',
-            u'/double_repeat/bed_net[1]/member[2]/name',
-            u'/double_repeat/bed_net[2]/member[1]/name',
-            u'/double_repeat/bed_net[2]/member[2]/name',
-            u'/double_repeat/meta/instanceID'
+            u'/data/bed_net[1]/member[1]/name',
+            u'/data/bed_net[1]/member[2]/name',
+            u'/data/bed_net[2]/member[1]/name',
+            u'/data/bed_net[2]/member[2]/name',
+            u'/data/meta/instanceID'
         ]
         self.assertEquals(data_dictionary.xpaths(repeat_iterations=2), xpaths)
         # test csv
diff --git a/onadata/apps/main/tests/test_process.py b/onadata/apps/main/tests/test_process.py
index 50e7b104e8..e46df8e9bc 100644
--- a/onadata/apps/main/tests/test_process.py
+++ b/onadata/apps/main/tests/test_process.py
@@ -246,7 +246,7 @@ def _download_xform(self):
         uuid_nodes = [node for node in model_node.childNodes
                       if node.nodeType == Node.ELEMENT_NODE and
                       node.getAttribute("nodeset") ==
-                      "/transportation/formhub/uuid"]
+                      "/data/formhub/uuid"]
         self.assertEqual(len(uuid_nodes), 1)
         uuid_node = uuid_nodes[0]
         uuid_node.setAttribute("calculate", "''")
@@ -560,7 +560,7 @@ def test_uuid_injection_in_cascading_select(self):
                                 node.nodeType == Node.ELEMENT_NODE and
                                 node.tagName == "bind" and
                                 node.getAttribute("nodeset") ==
-                                "/%s/formhub/uuid" % file_name]
+                                "/data/formhub/uuid"]
         self.assertEqual(len(calculate_bind_nodes), 1)
         calculate_bind_node = calculate_bind_nodes[0]
         self.assertEqual(
diff --git a/onadata/apps/viewer/tests/test_exports.py b/onadata/apps/viewer/tests/test_exports.py
index 692a1700be..387c30e708 100644
--- a/onadata/apps/viewer/tests/test_exports.py
+++ b/onadata/apps/viewer/tests/test_exports.py
@@ -824,7 +824,7 @@ def _get_xls_data(self, filepath):
         storage = get_storage_class()()
         with storage.open(filepath) as f:
             workbook = open_workbook(file_contents=f.read())
-        transportation_sheet = workbook.sheet_by_name("transportation")
+        transportation_sheet = workbook.sheet_by_name("data")
         self.assertTrue(transportation_sheet.nrows > 1)
         headers = transportation_sheet.row_values(0)
         column1 = transportation_sheet.row_values(1)
diff --git a/onadata/libs/tests/utils/fixtures/single.xml b/onadata/libs/tests/utils/fixtures/single.xml
index 77d818bd30..37a376be32 100644
--- a/onadata/libs/tests/utils/fixtures/single.xml
+++ b/onadata/libs/tests/utils/fixtures/single.xml
@@ -1 +1 @@
-<?xml version="1.0" ?><tutorial id="tutorial" instanceID="uuid:uuid:fa7f34af-8e28-4d05-9085-b495f0bd9491" submissionDate="2014-09-04T12:08:04"><age>10</age><end_time>2014-09-04T15:07:17+03:00</end_time><formhub>  <uuid>a55d89f9483a45c8a896d45de94499a9</uuid></formhub><gender>male</gender><imei>enketo.org:2gnoXEilHRGn6V5i</imei><location>83.3595 -32.8601 0 1</location><meta>  <instanceID>uuid:fa7f34af-8e28-4d05-9085-b495f0bd9491</instanceID></meta><name>Name_1</name><phonenumber>no phonenumber property in enketo</phonenumber><photo>NA</photo><pizza_fan>no</pizza_fan><start_time>2014-09-04T15:06:01+03:00</start_time><test_location>83.3595 -32.8601 0 1</test_location><test_location.altitude>0</test_location.altitude><test_location.latitude>83.3595</test_location.latitude><test_location.longitude>-32.8601</test_location.longitude><test_location.precision>1</test_location.precision><test_location2>21.22474 -10.5601 50000 200</test_location2><test_location2.altitude>50000</test_location2.altitude><test_location2.latitude>21.22474</test_location2.latitude><test_location2.longitude>-10.5601</test_location2.longitude><test_location2.precision>200</test_location2.precision><today>2014-09-04</today></tutorial>
+<?xml version="1.0" ?><data id="tutorial" instanceID="uuid:uuid:fa7f34af-8e28-4d05-9085-b495f0bd9491" submissionDate="2014-09-04T12:08:04"><age>10</age><end_time>2014-09-04T15:07:17+03:00</end_time><formhub>  <uuid>a55d89f9483a45c8a896d45de94499a9</uuid></formhub><gender>male</gender><imei>enketo.org:2gnoXEilHRGn6V5i</imei><location>83.3595 -32.8601 0 1</location><meta>  <instanceID>uuid:fa7f34af-8e28-4d05-9085-b495f0bd9491</instanceID></meta><name>Name_1</name><phonenumber>no phonenumber property in enketo</phonenumber><photo>NA</photo><pizza_fan>no</pizza_fan><start_time>2014-09-04T15:06:01+03:00</start_time><test_location>83.3595 -32.8601 0 1</test_location><test_location.altitude>0</test_location.altitude><test_location.latitude>83.3595</test_location.latitude><test_location.longitude>-32.8601</test_location.longitude><test_location.precision>1</test_location.precision><test_location2>21.22474 -10.5601 50000 200</test_location2><test_location2.altitude>50000</test_location2.altitude><test_location2.latitude>21.22474</test_location2.latitude><test_location2.longitude>-10.5601</test_location2.longitude><test_location2.precision>200</test_location2.precision><today>2014-09-04</today></data>
diff --git a/onadata/libs/tests/utils/test_viewer_tools.py b/onadata/libs/tests/utils/test_viewer_tools.py
index a81a675aa1..328e48f6d9 100644
--- a/onadata/libs/tests/utils/test_viewer_tools.py
+++ b/onadata/libs/tests/utils/test_viewer_tools.py
@@ -63,7 +63,7 @@ def test_get_enketo_defaults_with_right_xform(self):
         kwargs = {xform_variable_name: xform_variable_value}
         defaults = generate_enketo_form_defaults(self.xform, **kwargs)
 
-        key = "defaults[/transportation/transport/{}]".format(
+        key = "defaults[/data/transport/{}]".format(
             xform_variable_name)
         self.assertEqual(defaults, {key: xform_variable_value})
 
@@ -87,9 +87,9 @@ def test_get_enketo_defaults_with_multiple_params(self):
         defaults = generate_enketo_form_defaults(self.xform, **kwargs)
 
         transportation_types_key = \
-            "defaults[/transportation/transport/{}]".format(
+            "defaults[/data/transport/{}]".format(
                 transportation_types)
-        frequency_key = "defaults[/transportation/transport/"\
+        frequency_key = "defaults[/data/transport/"\
                         "loop_over_transport_types_frequency/"\
                         "{}/{}]".format(transportation_types_value, frequency)
         self.assertIn(transportation_types_key, defaults)