=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java	2013-09-30 12:00:52 +0000
@@ -33,7 +33,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.DhisConvenienceTest;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.system.util.FilterUtils;
 import org.junit.Test;
@@ -43,7 +43,7 @@
  * @version $Id$
  */
 public class AggregatableDataElementFilterTest
-    extends DhisTest
+    extends DhisConvenienceTest
 {
     @Test
     public void filter()

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/DataElementWithAggregationFilterTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/DataElementWithAggregationFilterTest.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/DataElementWithAggregationFilterTest.java	2013-09-30 12:00:52 +0000
@@ -34,7 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.DhisConvenienceTest;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.period.MonthlyPeriodType;
@@ -46,7 +46,7 @@
  * @version $Id$
  */
 public class DataElementWithAggregationFilterTest
-    extends DhisTest
+    extends DhisConvenienceTest
 {
     @Test
     public void filter()

=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisTest.java	2013-09-20 15:12:37 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisTest.java	2013-09-30 12:00:52 +0000
@@ -58,6 +58,8 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
+ * TODO remove this class and its usage, too slow.
+ * 
  * @author Lars Helge Overland
  * @version $Id$
  */