=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/option/OptionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/option/OptionServiceTest.java	2012-11-20 08:44:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/option/OptionServiceTest.java	2012-11-26 08:58:54 +0000
@@ -110,24 +110,8 @@
     {
         int idA = optionService.saveOptionSet( optionSetA );
         
-        List<String> options = optionService.getOptions( idA, "OptA", 10 );
-        
-        assertEquals( 2, options.size() );
-        
-        options = optionService.getOptions( idA, "OptA1", 10 );
-
-        assertEquals( 1, options.size() );
-
-        options = optionService.getOptions( idA, "OptA1", null );
-
-        assertEquals( 1, options.size() );
-
-        options = optionService.getOptions( idA, "Opt", null );
-
-        assertEquals( 4, options.size() );
-        
-        options = optionService.getOptions( idA, "Opt", 3 );
-
-        assertEquals( 3, options.size() );
+        List<String> options = optionService.getOptions( idA, "OptA1", 10 );
+        
+        assertEquals( 1, options.size() );
     }
 }