Index: test/sansguiframe/test/cansas1d.xml
===================================================================
--- test/sansguiframe/test/cansas1d.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansguiframe/test/cansas1d.xml	(revision be577e73697f1bbd3f93250dd594d00eff510718)
@@ -49,5 +49,5 @@
 			
 		</SASsample>
-		<SASinstrument name="TEST instrument">
+		<SASinstrument>
 			<name>canSAS instrument</name>
 			<SASsource name="source name">
@@ -85,13 +85,13 @@
 					4.150
 				</SDD>
-				<orientation>
+				<offset>
+                    <x unit="mm">1</x>
+                    <y unit="mm">2</y>
+                </offset>
+                <orientation>
 					<roll unit="degree">1.00</roll>
 					<pitch unit="degree">0.00</pitch>
 					<yaw unit="degree">0.00</yaw>
 				</orientation>
-				<offset>
-					<x unit="mm">1</x>
-					<y unit="mm">2</y>
-				</offset>
 				<beam_center>
 					<x unit="mm">322.64</x>
@@ -135,5 +135,5 @@
 			<term name="ABS:IZERO">230.09</term>
 			<term name="ABS:XSECT" unit="mm">1</term>
-			<SASprocessnote/>
+			<SASprocessnote>No Information</SASprocessnote>
 		</SASprocess>
 		<SASnote />
Index: test/sansguiframe/test/utest_manipulations.py
===================================================================
--- test/sansguiframe/test/utest_manipulations.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansguiframe/test/utest_manipulations.py	(revision be577e73697f1bbd3f93250dd594d00eff510718)
@@ -15,5 +15,6 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
+        data = Loader().load("cansas1d.xml")
+        self.data = data[0]
         
     def test_clone1D(self):
@@ -29,5 +30,6 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
+        data = Loader().load("cansas1d.xml")
+        self.data = data[0]
         
     def test_clone_theory1D(self):
Index: test/sansinvariant/test/utest_data_handling.py
===================================================================
--- test/sansinvariant/test/utest_data_handling.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansinvariant/test/utest_data_handling.py	(revision be577e73697f1bbd3f93250dd594d00eff510718)
@@ -92,5 +92,6 @@
     """
     def setUp(self):
-        self.data = Loader().load("latex_smeared_slit.xml")
+        data = Loader().load("latex_smeared_slit.xml")
+        self.data = data[0]
         self.data.dxl = None
         
Index: test/sansmodels/test/cansas1d_slit.xml
===================================================================
--- test/sansmodels/test/cansas1d_slit.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansmodels/test/cansas1d_slit.xml	(revision be577e73697f1bbd3f93250dd594d00eff510718)
@@ -14,7 +14,7 @@
 				<I unit="1/cm">1000</I>
 				<Idev unit="1/cm">3</Idev>
+				<dQw unit="1/A">0.001</dQw>
 				<dQl unit="1/A">0.005</dQl>
-				<dQw unit="1/A">0.001</dQw>
-				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
 			</Idata>
 			<Idata>
@@ -22,7 +22,7 @@
 				<I unit="1/cm">1001</I>
 				<Idev unit="1/cm">4</Idev>
+				<dQw unit="1/A">0.001</dQw>
 				<dQl unit="1/A">0.005</dQl>
-				<dQw unit="1/A">0.001</dQw>
-				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
 			</Idata>
 		</SASdata>
@@ -49,5 +49,5 @@
 			
 		</SASsample>
-		<SASinstrument name="TEST instrument">
+		<SASinstrument>
 			<name>canSAS instrument</name>
 			<SASsource name="source name">
@@ -85,13 +85,13 @@
 					4.150
 				</SDD>
-				<orientation>
+				<offset>
+                    <x unit="mm">1</x>
+                    <y unit="mm">2</y>
+                </offset>
+                <orientation>
 					<roll unit="degree">1.00</roll>
 					<pitch unit="degree">0.00</pitch>
 					<yaw unit="degree">0.00</yaw>
 				</orientation>
-				<offset>
-					<x unit="mm">1</x>
-					<y unit="mm">2</y>
-				</offset>
 				<beam_center>
 					<x unit="mm">322.64</x>
Index: test/sansmodels/test/utest_smearing.py
===================================================================
--- test/sansmodels/test/utest_smearing.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansmodels/test/utest_smearing.py	(revision be577e73697f1bbd3f93250dd594d00eff510718)
@@ -16,5 +16,6 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d_slit.xml")
+        data = Loader().load("cansas1d_slit.xml")
+        self.data = data[0]
         
         x = 0.001*numpy.arange(1,11)
