=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java	2015-09-04 09:29:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java	2015-10-02 08:35:40 +0000
@@ -118,43 +118,6 @@
     }
 
     @Test
-    public void testInsertObject()
-    {
-        int idA = batchHandler.insertObject( dataElementA, true );
-        int idB = batchHandler.insertObject( dataElementB, true );
-        int idC = batchHandler.insertObject( dataElementC, true );
-
-        assertNotNull( dataElementService.getDataElement( idA ) );
-        assertNotNull( dataElementService.getDataElement( idB ) );
-        assertNotNull( dataElementService.getDataElement( idC ) );
-    }
-
-    @Test
-    public void testInsertWithSpecialCharacters()
-    {
-        dataElementA.setDescription( "'quote'" );
-        dataElementB.setDescription( "\\backslash\\" );
-        dataElementC.setDescription( ";semicolon;" );
-
-        batchHandler.insertObject( dataElementA, false );
-        batchHandler.insertObject( dataElementB, false );
-        batchHandler.insertObject( dataElementC, false );
-    }
-
-    @Test
-    public void testUpdateObject()
-    {
-        int id = batchHandler.insertObject( dataElementA, true );
-
-        dataElementA.setId( id );
-        dataElementA.setName( "UpdatedName" );
-
-        batchHandler.updateObject( dataElementA );
-
-        assertEquals( "UpdatedName", dataElementService.getDataElement( id ).getName() );
-    }
-
-    @Test
     public void testGetObjectIdentifier()
     {
         int referenceId = dataElementService.addDataElement( dataElementA );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java	2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java	2015-10-02 08:35:40 +0000
@@ -198,34 +198,6 @@
     }
 
     @Test
-    public void testInsertObject()
-    {
-        batchHandler.insertObject( dataValueA, false );
-        batchHandler.insertObject( dataValueB, false );
-        batchHandler.insertObject( dataValueC, false );
-        batchHandler.insertObject( dataValueD, false );
-        
-        assertNotNull( dataValueService.getDataValue( dataElementA, periodA, unitA, categoryOptionComboA ) );
-        assertNotNull( dataValueService.getDataValue( dataElementA, periodA, unitB, categoryOptionComboA ) );
-        assertNotNull( dataValueService.getDataValue( dataElementA, periodB, unitA, categoryOptionComboA ) );
-        assertNotNull( dataValueService.getDataValue( dataElementA, periodB, unitB, categoryOptionComboA ) );
-    }
-
-    @Test
-    public void testUpdateObject()
-    {
-        batchHandler.insertObject( dataValueA, false );
-        
-        dataValueA.setValue( "20" );
-        
-        batchHandler.updateObject( dataValueA );
-        
-        dataValueA = dataValueService.getDataValue( dataElementA, periodA, unitA, categoryOptionComboA );
-        
-        assertEquals( "20", dataValueA.getValue() );
-    }
-
-    @Test
     public void testObjectExists()
     {
         dataValueService.addDataValue( dataValueA );

=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java	2015-10-02 08:35:40 +0000
@@ -70,7 +70,6 @@
         return inserts.add( object );
     }
 
-    @Override
     public int insertObject( T object, boolean returnGeneratedIdentifier )
     {
         inserts.add( object );