diff --git a/android-json-form-wizard/src/test/java/com/vijay/jsonwizard/domain/MultiSelectListAccessoryTest.java b/android-json-form-wizard/src/test/java/com/vijay/jsonwizard/domain/MultiSelectListAccessoryTest.java
index 22f897511..cb0a29d06 100644
--- a/android-json-form-wizard/src/test/java/com/vijay/jsonwizard/domain/MultiSelectListAccessoryTest.java
+++ b/android-json-form-wizard/src/test/java/com/vijay/jsonwizard/domain/MultiSelectListAccessoryTest.java
@@ -1,6 +1,6 @@
 package com.vijay.jsonwizard.domain;
 
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import com.vijay.jsonwizard.adapter.MultiSelectListAdapter;
 import com.vijay.jsonwizard.adapter.MultiSelectListSelectedAdapter;
diff --git a/form_tester/build.gradle b/form_tester/build.gradle
index 96afd02fc..2674898ff 100644
--- a/form_tester/build.gradle
+++ b/form_tester/build.gradle
@@ -61,4 +61,5 @@ dependencies {
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'org.smartregister:opensrp-client-utils:0.0.4-SNAPSHOT'
 }
diff --git a/form_tester/src/main/java/org/smartregister/nativeform_tester/FormTesterActivity.java b/form_tester/src/main/java/org/smartregister/nativeform_tester/FormTesterActivity.java
index 7be5e97c6..a0041df71 100644
--- a/form_tester/src/main/java/org/smartregister/nativeform_tester/FormTesterActivity.java
+++ b/form_tester/src/main/java/org/smartregister/nativeform_tester/FormTesterActivity.java
@@ -8,12 +8,13 @@
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/form_tester/src/main/java/org/smartregister/nativeform_tester/MainActivity.java b/form_tester/src/main/java/org/smartregister/nativeform_tester/MainActivity.java
index 6787defd7..b5d77cc71 100644
--- a/form_tester/src/main/java/org/smartregister/nativeform_tester/MainActivity.java
+++ b/form_tester/src/main/java/org/smartregister/nativeform_tester/MainActivity.java
@@ -2,13 +2,14 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import com.vijay.jsonwizard.activities.JsonFormActivity;
 import com.vijay.jsonwizard.activities.JsonFormBaseActivity;
 import com.vijay.jsonwizard.activities.JsonWizardFormActivity;
@@ -188,7 +189,6 @@ public void startForm(int jsonFormActivityRequestCode, String formName, String e
                 }
                 default: {
 
-
                     String currentEntityID = (entityId == null) ? "ABC" + Math.random() : entityId;
 
 
diff --git a/form_tester/src/main/java/org/smartregister/nativeform_tester/adapter/NativeFormAdapter.java b/form_tester/src/main/java/org/smartregister/nativeform_tester/adapter/NativeFormAdapter.java
index 175dabd67..416b43404 100644
--- a/form_tester/src/main/java/org/smartregister/nativeform_tester/adapter/NativeFormAdapter.java
+++ b/form_tester/src/main/java/org/smartregister/nativeform_tester/adapter/NativeFormAdapter.java
@@ -1,7 +1,8 @@
 package org.smartregister.nativeform_tester.adapter;
 
 import androidx.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;