=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java'
--- dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java	2009-08-24 13:55:25 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java	2010-04-13 09:05:14 +0000
@@ -69,7 +69,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "DataSet", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 3, table.getRows().size() );
@@ -97,7 +97,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "DataSet", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 1, table.getRows().size() );
@@ -124,7 +124,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "DataElementGroup", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 3, table.getRows().size() );
@@ -153,7 +153,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "DataElementGroup", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 1, table.getRows().size() );
@@ -180,7 +180,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "OrgUnitGroup", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 2, table.getRows().size() );
@@ -251,7 +251,7 @@
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "OrganisationUnit", table.getColumns().get( 0 ).getName() );
         // Service layer adds "zero-column"
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         assertEquals( "Metarows", 0, table.getRows().size() );
     }
@@ -434,7 +434,7 @@
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "DataElement", table.getColumns().get( 0 ).getName() );
         // Service layer adds "zero-column"
-        assertEquals( "Period column header", "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "Period column header", "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by name
         assertEquals( "Metarows", 0, table.getRows().size() );

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserStoreTest.java'
--- dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserStoreTest.java	2009-08-24 13:55:25 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserStoreTest.java	2010-04-13 09:05:14 +0000
@@ -76,7 +76,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "DataSet", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 3, table.getRows().size() );
@@ -155,7 +155,7 @@
 
         assertEquals( "Metacolumns", 2, table.getColumns().size() );
         assertEquals( "OrgUnitGroup", table.getColumns().get( 0 ).getName() );
-        assertEquals( "Count", table.getColumns().get( 1 ).getName() );
+        assertEquals( "counts_of_aggregated_values", table.getColumns().get( 1 ).getName() );
 
         // Sorted by count
         assertEquals( "Metarows", 2, table.getRows().size() );