=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java	2015-04-09 11:00:43 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java	2015-04-09 11:01:31 +0000
@@ -243,6 +243,7 @@
     public void testUpdateCompleted()
     {
         Enrollment enrollment = new Enrollment();
+        enrollment.setOrgUnit( organisationUnitA.getUid() );
         enrollment.setTrackedEntityInstance( maleA.getUid() );
         enrollment.setProgram( programA.getUid() );
         enrollment.setDateOfIncident( new Date() );
@@ -270,6 +271,7 @@
     public void testUpdateCancelled()
     {
         Enrollment enrollment = new Enrollment();
+        enrollment.setOrgUnit( organisationUnitA.getUid() );
         enrollment.setTrackedEntityInstance( maleA.getUid() );
         enrollment.setProgram( programA.getUid() );
         enrollment.setDateOfIncident( new Date() );
@@ -294,6 +296,7 @@
     public void testUpdateReEnrollmentShouldFail()
     {
         Enrollment enrollment = new Enrollment();
+        enrollment.setOrgUnit( organisationUnitA.getUid() );
         enrollment.setTrackedEntityInstance( maleA.getUid() );
         enrollment.setProgram( programA.getUid() );
         enrollment.setDateOfIncident( new Date() );