diff --git a/form/src/test/java/org/dhis2/form/data/EnrollmentRepositoryTest.kt b/form/src/test/java/org/dhis2/form/data/EnrollmentRepositoryTest.kt
index 16a79d78d9d..5ca3bb5c20c 100644
--- a/form/src/test/java/org/dhis2/form/data/EnrollmentRepositoryTest.kt
+++ b/form/src/test/java/org/dhis2/form/data/EnrollmentRepositoryTest.kt
@@ -1,6 +1,7 @@
 package org.dhis2.form.data
 
 import junit.framework.TestCase.assertTrue
+import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.form.data.EnrollmentRepository.Companion.ORG_UNIT_UID
 import org.dhis2.form.data.metadata.EnrollmentConfiguration
 import org.dhis2.form.model.EnrollmentMode
@@ -20,6 +21,7 @@ class EnrollmentRepositoryTest {
     private val conf: EnrollmentConfiguration = mock()
     private val enrollmentMode: EnrollmentMode = mock()
     private val enrolmentFormLabelsProvider: EnrollmentFormLabelsProvider = mock()
+    private val metadataIconProvider: MetadataIconProvider = mock()
     lateinit var repository: DataEntryRepository
     val programSection: ProgramSection = mock()
 
@@ -56,6 +58,7 @@ class EnrollmentRepositoryTest {
             conf,
             enrollmentMode,
             enrolmentFormLabelsProvider,
+            metadataIconProvider,
         )
     }
 
diff --git a/form/src/test/java/org/dhis2/form/data/FieldUiModelTest.kt b/form/src/test/java/org/dhis2/form/data/FieldUiModelTest.kt
deleted file mode 100644
index 1cb9a1c1789..00000000000
--- a/form/src/test/java/org/dhis2/form/data/FieldUiModelTest.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.dhis2.form.data
-
-import org.dhis2.form.model.FieldUiModelImpl
-import org.dhis2.form.model.OptionSetConfiguration
-import org.hisp.dhis.android.core.common.ValueType
-import org.hisp.dhis.android.core.option.Option
-import org.junit.Test
-
-class FieldUiModelTest {
-
-    @Test
-    fun `should set optionsToDisplay when there is optionsToHide`() {
-        val optionsToHide = listOf("1", "2")
-        val matrixOptionSetModel = fieldUiModel().also {
-            val conf = it.optionSetConfiguration
-            it.optionSetConfiguration = when (conf) {
-                is OptionSetConfiguration.BigOptionSet ->
-                    conf.copy(optionsToHide = optionsToHide)
-                is OptionSetConfiguration.DefaultOptionSet ->
-                    conf.copy(optionsToHide = optionsToHide)
-                null -> conf
-            }
-        }
-        assert(
-            matrixOptionSetModel.optionSetConfiguration?.optionsToDisplay()
-                ?.map { it.uid() } == listOf("3", "4", "5"),
-        )
-    }
-
-    @Test
-    fun `should set optionsToDisplay when there is optionsToShow`() {
-        val optionsInGroupToShow = listOf("1", "2")
-        val matrixOptionSetModel = fieldUiModel().also {
-            val conf = it.optionSetConfiguration
-            it.optionSetConfiguration = when (conf) {
-                is OptionSetConfiguration.BigOptionSet ->
-                    conf.copy(optionsToShow = optionsInGroupToShow)
-                is OptionSetConfiguration.DefaultOptionSet ->
-                    conf.copy(optionsToShow = optionsInGroupToShow)
-                null -> conf
-            }
-        }
-        assert(
-            matrixOptionSetModel.optionSetConfiguration?.optionsToDisplay()
-                ?.map { it.uid() } == listOf("1", "2"),
-        )
-    }
-
-    @Test
-    fun `should set optionsToDisplay when there are optionsToShow and optionsToHide`() {
-        val optionsToHide = listOf("1")
-        val optionsInGroupToShow = listOf("3", "5")
-
-        val matrixOptionSetModel = fieldUiModel().also {
-            val conf = it.optionSetConfiguration
-            it.optionSetConfiguration = when (conf) {
-                is OptionSetConfiguration.BigOptionSet -> conf.copy(
-                    optionsToHide = optionsToHide,
-                    optionsToShow = optionsInGroupToShow,
-                )
-                is OptionSetConfiguration.DefaultOptionSet -> conf.copy(
-                    optionsToHide = optionsToHide,
-                    optionsToShow = optionsInGroupToShow,
-                )
-                null -> conf
-            }
-        }
-        assert(
-            matrixOptionSetModel.optionSetConfiguration?.optionsToDisplay()
-                ?.map { it.uid() } == listOf("3", "5"),
-        )
-    }
-
-    private fun fieldUiModel() = FieldUiModelImpl(
-        "uid",
-        label = "label",
-        valueType = ValueType.TEXT,
-        optionSetConfiguration = OptionSetConfiguration.config(5) {
-            OptionSetConfiguration.OptionConfigData(
-                listOf(
-                    Option.builder().uid("1").build(),
-                    Option.builder().uid("2").build(),
-                    Option.builder().uid("3").build(),
-                    Option.builder().uid("4").build(),
-                    Option.builder().uid("5").build(),
-                ),
-                emptyMap(),
-            )
-        },
-        autocompleteList = null,
-    )
-}
diff --git a/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt b/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt
index fb2d09ab5c3..dd5d9b4a7a4 100644
--- a/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt
+++ b/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt
@@ -1,6 +1,7 @@
 package org.dhis2.form.data
 
 import org.dhis2.commons.prefs.PreferenceProvider
+import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.form.data.metadata.EnrollmentConfiguration
 import org.dhis2.form.model.EnrollmentMode
 import org.dhis2.form.model.SectionUiModelImpl
@@ -43,6 +44,7 @@ class FormRepositoryIntegrationTest {
         on { provideEnrollmentOrgUnitLabel() } doReturn "OrgUnit label"
         on { provideEnrollmentDataSectionLabel(any()) } doReturn "Enrollment data"
     }
+    private val metadataIconProvider: MetadataIconProvider = mock()
 
     private val program: Program = mock {
         on { uid() } doReturn "programUid"
@@ -173,6 +175,7 @@ class FormRepositoryIntegrationTest {
             conf,
             enrollmentMode,
             enrollmentFormLabelsProvider,
+            metadataIconProvider,
         )
 
         return FormRepositoryImpl(
diff --git a/form/src/test/java/org/dhis2/form/data/GeometryControllerTest.kt b/form/src/test/java/org/dhis2/form/data/GeometryControllerTest.kt
index 8f326c34258..294f3768281 100644
--- a/form/src/test/java/org/dhis2/form/data/GeometryControllerTest.kt
+++ b/form/src/test/java/org/dhis2/form/data/GeometryControllerTest.kt
@@ -1,7 +1,5 @@
 package org.dhis2.form.data
 
-import org.dhis2.form.ui.event.RecyclerViewUiEvents
-import org.dhis2.form.ui.intent.FormIntent
 import org.hisp.dhis.android.core.common.FeatureType
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -45,37 +43,4 @@ class GeometryControllerTest {
                 result.coordinates()?.isNotEmpty() == true,
         )
     }
-
-    @Test
-    fun `Should return coordinates callback`() {
-        var currentCallback: Int = -1
-        val coordinateCallback = controller.getCoordinatesCallback(
-            {
-                currentCallback = 0
-            },
-            { currentCallback = 1 },
-            { _, _, _ -> currentCallback = 2 },
-        )
-
-        coordinateCallback.intent(
-            FormIntent.SaveCurrentLocation(
-                uid = "fieldUid",
-                value = null,
-                featureType = "none",
-            ),
-        )
-        assertTrue(currentCallback == 0)
-        coordinateCallback.recyclerViewUiEvents(
-            RecyclerViewUiEvents.RequestCurrentLocation("fieldUid"),
-        )
-        assertTrue(currentCallback == 1)
-        coordinateCallback.recyclerViewUiEvents(
-            RecyclerViewUiEvents.RequestLocationByMap(
-                "fieldUid",
-                FeatureType.POINT,
-                null,
-            ),
-        )
-        assertTrue(currentCallback == 2)
-    }
 }
diff --git a/form/src/test/java/org/dhis2/form/integration/ProgramRulesTest.kt b/form/src/test/java/org/dhis2/form/integration/ProgramRulesTest.kt
index 1c5d88d8d18..259b6376e37 100644
--- a/form/src/test/java/org/dhis2/form/integration/ProgramRulesTest.kt
+++ b/form/src/test/java/org/dhis2/form/integration/ProgramRulesTest.kt
@@ -6,6 +6,7 @@ import io.reactivex.Flowable
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.resetMain
@@ -31,9 +32,7 @@ import org.dhis2.form.ui.FormViewModel
 import org.dhis2.form.ui.intent.FormIntent
 import org.dhis2.mobileProgramRules.RuleEngineHelper
 import org.hisp.dhis.android.core.D2
-import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.common.ValueType
-import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.program.ProgramRuleActionType
 import org.hisp.dhis.rules.models.RuleAction
 import org.hisp.dhis.rules.models.RuleEffect
@@ -48,6 +47,7 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
 class ProgramRulesTest {
@@ -106,7 +106,10 @@ class ProgramRulesTest {
             invocationOnMock.getArgument(0) as FieldUiModel
         }
 
-        whenever(formValueStore.save(any(), anyOrNull(), anyOrNull())) doReturn StoreResult("", ValueStoreResult.VALUE_CHANGED)
+        whenever(formValueStore.save(any(), anyOrNull(), anyOrNull())) doReturn StoreResult(
+            "",
+            ValueStoreResult.VALUE_CHANGED,
+        )
 
         repository = FormRepositoryImpl(
             formValueStore = formValueStore,
@@ -372,13 +375,21 @@ class ProgramRulesTest {
 
         val items = formViewModel.items.value ?: emptyList()
 
-        val optionsToDisplay: List<Option> =
-            items.find { it.uid == "uid006" }!!.optionSetConfiguration!!.optionsToDisplay()
-
-        assertTrue(optionsToDisplay.size == 3)
-        assertTrue(optionsToDisplay[0].uid() == "Option2")
-        assertTrue(optionsToDisplay[1].uid() == "Option3")
-        assertTrue(optionsToDisplay[2].uid() == "Option4")
+        verify(dataEntryRepository).options(
+            optionSetUid = "optionSetUid",
+            query = "",
+            optionsToHide = emptyList(),
+            optionGroupsToHide = emptyList(),
+            optionGroupsToShow = listOf("optionGroupId"),
+        )
+        /*
+                val optionsToDisplay: List<Option> =
+                    items.find { it.uid == "uid006" }!!.optionSetConfiguration!!.optionsToDisplay()
+
+                assertTrue(optionsToDisplay.size == 3)
+                assertTrue(optionsToDisplay[0].uid() == "Option2")
+                assertTrue(optionsToDisplay[1].uid() == "Option3")
+                assertTrue(optionsToDisplay[2].uid() == "Option4")*/
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -414,15 +425,13 @@ class ProgramRulesTest {
         formViewModel.submitIntent(intent)
         advanceUntilIdle()
 
-        val items = formViewModel.items.value ?: emptyList()
-
-        val optionsToDisplay: List<Option> =
-            items.last().optionSetConfiguration!!.optionsToDisplay()
-
-        optionsToDisplay.forEach {
-            assert(it.uid() != "Option2")
-        }
-        assert(optionsToDisplay.size == 4)
+        verify(dataEntryRepository).options(
+            optionSetUid = "optionSetUid",
+            query = "",
+            optionsToHide = listOf("Option2"),
+            optionGroupsToHide = emptyList(),
+            optionGroupsToShow = emptyList(),
+        )
     }
 
     private fun provideItemList() = listOf(
@@ -486,11 +495,8 @@ class ProgramRulesTest {
             value = "value06",
             label = "field6",
             valueType = ValueType.MULTI_TEXT,
-            optionSetConfiguration = OptionSetConfiguration.DefaultOptionSet(
-                options = "optionSetUid".listOfOptions(),
-                optionsToHide = listOf(),
-                optionsToShow = listOf("Option2", "Option3", "Option4"),
-                optionMetadataIcon = mapOf(),
+            optionSetConfiguration = OptionSetConfiguration(
+                emptyFlow(),
             ),
             autocompleteList = null,
             programStageSection = "section2",
@@ -501,31 +507,10 @@ class ProgramRulesTest {
             value = "value07",
             label = "field7",
             valueType = ValueType.MULTI_TEXT,
-            optionSetConfiguration = OptionSetConfiguration.DefaultOptionSet(
-                options = "optionSetUid".listOfOptions(),
-                optionsToHide = listOf("Option2"),
-                optionsToShow = listOf(),
-                optionMetadataIcon = mapOf(),
-            ),
+            optionSetConfiguration = OptionSetConfiguration(emptyFlow()),
             autocompleteList = null,
             programStageSection = "section2",
             optionSet = "optionSetUid",
         ),
     )
-
-    private fun String.listOfOptions(): List<Option> {
-        val optionSetUid = ObjectWithUid.create(this)
-        val options: MutableList<Option> = mutableListOf()
-        repeat(5) { index ->
-            options.add(
-                Option.builder()
-                    .uid("Option$index")
-                    .displayName("name$index")
-                    .code("code$index")
-                    .optionSet(optionSetUid)
-                    .build(),
-            )
-        }
-        return options.toList()
-    }
 }
diff --git a/form/src/test/java/org/dhis2/form/model/OptionSetDialogViewModelTest.kt b/form/src/test/java/org/dhis2/form/model/OptionSetDialogViewModelTest.kt
index 3331da2c34c..3b7dcd45cc8 100644
--- a/form/src/test/java/org/dhis2/form/model/OptionSetDialogViewModelTest.kt
+++ b/form/src/test/java/org/dhis2/form/model/OptionSetDialogViewModelTest.kt
@@ -4,6 +4,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
@@ -94,11 +95,8 @@ class OptionSetDialogViewModelTest {
     @Test
     fun `Should search and filter options to hide`() {
         val optionsToHide = listOf("Option1")
-        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration.DefaultOptionSet(
-            options = emptyList(),
-            optionsToHide = optionsToHide,
-            optionsToShow = emptyList(),
-            emptyMap(),
+        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration(
+            emptyFlow(),
         )
         viewModel.onSearchingOption("test")
         testingDispatcher.scheduler.advanceUntilIdle()
@@ -114,11 +112,8 @@ class OptionSetDialogViewModelTest {
     @Test
     fun `Should search and filter options to show`() {
         val optionsToShow = listOf("Option1")
-        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration.DefaultOptionSet(
-            options = emptyList(),
-            optionsToHide = emptyList(),
-            optionsToShow = optionsToShow,
-            emptyMap(),
+        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration(
+            emptyFlow(),
         )
         viewModel.onSearchingOption("test")
         assertTrue(viewModel.searchValue.value == "test")
@@ -135,11 +130,8 @@ class OptionSetDialogViewModelTest {
     fun `Should search and filter options to show and hide`() {
         val optionsToShow = listOf("Option1")
         val optionsToHide = listOf("Option1")
-        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration.DefaultOptionSet(
-            options = emptyList(),
-            optionsToHide = optionsToHide,
-            optionsToShow = optionsToShow,
-            emptyMap(),
+        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration(
+            emptyFlow(),
         )
         viewModel.onSearchingOption("test")
         testingDispatcher.scheduler.advanceUntilIdle()
diff --git a/form/src/test/java/org/dhis2/form/ui/DataEntryIntegrationTest.kt b/form/src/test/java/org/dhis2/form/ui/DataEntryIntegrationTest.kt
index 56496f09d26..e3f5ae4e650 100644
--- a/form/src/test/java/org/dhis2/form/ui/DataEntryIntegrationTest.kt
+++ b/form/src/test/java/org/dhis2/form/ui/DataEntryIntegrationTest.kt
@@ -3,9 +3,11 @@ package org.dhis2.form.ui
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.databinding.ObservableField
 import androidx.lifecycle.Observer
+import androidx.paging.PagingData
 import io.reactivex.Flowable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.test.setMain
@@ -30,6 +32,7 @@ import org.dhis2.form.ui.provider.DisplayNameProvider
 import org.dhis2.form.ui.provider.LegendValueProvider
 import org.dhis2.form.ui.validation.FieldErrorMessageProvider
 import org.dhis2.mobileProgramRules.RuleEngineHelper
+import org.dhis2.ui.MetadataIconData
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.option.Option
 import org.junit.Before
@@ -334,24 +337,33 @@ class DataEntryIntegrationTest {
                 label = "Gender",
                 programStageSection = "EVENT_DATA_SECTION_UID",
                 autocompleteList = emptyList(),
-                optionSetConfiguration = OptionSetConfiguration.DefaultOptionSet(
-                    options = listOf(
-                        Option.builder()
-                            .uid("rBvjJYbMCVx")
-                            .code("Male")
-                            .displayName("Male")
-                            .name("Male")
-                            .sortOrder(1)
-                            .build(),
-                        Option.builder()
-                            .uid("Mnp3oXrpAbK")
-                            .code("Female")
-                            .displayName("Female")
-                            .name("Female")
-                            .sortOrder(2)
-                            .build(),
-                    ),
-                    optionMetadataIcon = emptyMap(),
+                optionSetConfiguration = OptionSetConfiguration(
+                    flow {
+                        PagingData.from(
+                            listOf(
+                                OptionSetConfiguration.OptionData(
+                                    Option.builder()
+                                        .uid("rBvjJYbMCVx")
+                                        .code("Male")
+                                        .displayName("Male")
+                                        .name("Male")
+                                        .sortOrder(1)
+                                        .build(),
+                                    MetadataIconData.defaultIcon(),
+                                ),
+                                OptionSetConfiguration.OptionData(
+                                    Option.builder()
+                                        .uid("Mnp3oXrpAbK")
+                                        .code("Female")
+                                        .displayName("Female")
+                                        .name("Female")
+                                        .sortOrder(2)
+                                        .build(),
+                                    MetadataIconData.defaultIcon(),
+                                ),
+                            ),
+                        )
+                    },
                 ),
                 valueType = ValueType.MULTI_TEXT,
                 mandatory = true,
diff --git a/form/src/test/java/org/dhis2/form/ui/event/UiEventFactoryImplTest.kt b/form/src/test/java/org/dhis2/form/ui/event/UiEventFactoryImplTest.kt
deleted file mode 100644
index c30f4db5106..00000000000
--- a/form/src/test/java/org/dhis2/form/ui/event/UiEventFactoryImplTest.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.dhis2.form.ui.event
-
-import org.dhis2.form.model.FieldUiModelImpl
-import org.dhis2.form.model.UiEventType
-import org.hamcrest.MatcherAssert.assertThat
-import org.hisp.dhis.android.core.common.ValueType
-import org.junit.Test
-
-class UiEventFactoryImplTest {
-
-    private var uiEventFactory: UiEventFactory? = null
-
-    @Test
-    fun `Should return UiEvent OpenCustomCalendar for ValueType DATE`() {
-        uiEventFactory = provideEventForType(ValueType.DATE)
-
-        val event = uiEventFactory?.generateEvent(
-            value = "2021-09-27",
-            uiEventType = UiEventType.DATE_TIME,
-            fieldUiModel = provideFieldUiModel(),
-        )
-        assertThat(
-            "Event is OpenCustomCalendar",
-            event is RecyclerViewUiEvents.OpenCustomCalendar,
-        )
-    }
-
-    @Test
-    fun `Should return UiEvent OpenCustomCalendar for ValueType DATETIME`() {
-        uiEventFactory = provideEventForType(ValueType.DATETIME)
-
-        val event = uiEventFactory?.generateEvent(
-            value = "2021-09-27T10:20",
-            uiEventType = UiEventType.DATE_TIME,
-            fieldUiModel = provideFieldUiModel(),
-        )
-        assertThat(
-            "Event is OpenCustomCalendar",
-            event is RecyclerViewUiEvents.OpenCustomCalendar,
-        )
-    }
-
-    @Test
-    fun `Should return UiEvent OpenCustomCalendar for ValueType TIME`() {
-        uiEventFactory = provideEventForType(ValueType.TIME)
-
-        val event = uiEventFactory?.generateEvent(
-            value = "10:20",
-            uiEventType = UiEventType.DATE_TIME,
-            fieldUiModel = provideFieldUiModel(),
-        )
-        assertThat(
-            "Event is OpenTimePicker",
-            event is RecyclerViewUiEvents.OpenTimePicker,
-        )
-    }
-
-    private fun provideEventForType(valueType: ValueType) = UiEventFactoryImpl(
-        uid = "uid",
-        label = "label",
-        description = "description",
-        valueType = valueType,
-        true,
-        null,
-    )
-
-    private fun provideFieldUiModel() = FieldUiModelImpl(
-        uid = "uid",
-        label = "label",
-        valueType = ValueType.TEXT,
-        optionSetConfiguration = null,
-        autocompleteList = null,
-    )
-}