=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java	2011-01-17 13:40:50 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java	2011-02-02 21:37:29 +0000
@@ -262,6 +262,7 @@
     // Tests
     // -------------------------------------------------------------------------
     // TODO Improve test on duplicate GroupMemberAssociations
+    
     @Test
     public void testSimpleImportWithTransform() throws Exception
     {

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFOrganisationUnitsTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFOrganisationUnitsTest.java	2010-06-04 17:44:41 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFOrganisationUnitsTest.java	2011-02-02 21:37:29 +0000
@@ -69,7 +69,13 @@
     {
         inputStream.close();
     }
-    
+
+    @Override
+    public boolean emptyDatabaseAfterTest() // Empty before to avoid problem for subsequent tests?
+    {
+        return true;
+    }
+
     @Test
     public void testImportOrganisationUnits() throws Exception
     {