diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/help/HelpActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/help/HelpActivityTest.java
index 7492510b1..030388c38 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/help/HelpActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/help/HelpActivityTest.java
@@ -21,30 +21,25 @@ package org.kiwix.kiwixmobile.help;
 import android.Manifest;
 import android.content.Context;
 import android.support.test.espresso.intent.Intents;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+
 import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
 import com.schibsted.spain.barista.rule.BaristaRule;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kiwix.kiwixmobile.R;
-import org.kiwix.kiwixmobile.intro.IntroActivity;
 
-import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
-import static org.kiwix.kiwixmobile.testutils.Matcher.childAtPosition;
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
 
@@ -52,14 +47,13 @@ import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
 @RunWith(AndroidJUnit4.class)
 public class HelpActivityTest {
 
-  private Context context;
-
   @Rule
   public BaristaRule<HelpActivity> activityTestRule = BaristaRule.create(HelpActivity.class);
   @Rule
   public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
   @Rule
   public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+  private Context context;
 
   @Before
   public void setUp() {
diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/intro/IntroActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/intro/IntroActivityTest.java
index 45ccce6c4..be5bf6dbf 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/intro/IntroActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/intro/IntroActivityTest.java
@@ -21,9 +21,9 @@ package org.kiwix.kiwixmobile.intro;
 import android.Manifest;
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.espresso.intent.Intents;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
 import com.schibsted.spain.barista.rule.BaristaRule;
diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/splash/SplashActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/splash/SplashActivityTest.java
index 6a12da542..9f8a52420 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/splash/SplashActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/splash/SplashActivityTest.java
@@ -23,12 +23,13 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.test.espresso.intent.Intents;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
 import com.schibsted.spain.barista.rule.BaristaRule;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -37,28 +38,27 @@ import org.junit.runner.RunWith;
 import org.kiwix.kiwixmobile.intro.IntroActivity;
 import org.kiwix.kiwixmobile.main.MainActivity;
 
-import static org.junit.Assert.assertEquals;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_SHOW_INTRO;
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static android.support.test.espresso.intent.Intents.intended;
 import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static org.junit.Assert.assertEquals;
 import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
+import static org.kiwix.kiwixmobile.utils.Constants.PREF_SHOW_INTRO;
 
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class SplashActivityTest {
 
-  private Context context;
-
   @Rule
   public BaristaRule<SplashActivity> activityTestRule = BaristaRule.create(SplashActivity.class);
   @Rule
   public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
   @Rule
   public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+  private Context context;
 
   @Before
-  public void setUp(){
+  public void setUp() {
     Intents.init();
     context = getInstrumentation().getTargetContext();
   }
diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/BookmarksActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/BookmarksActivityTest.java
index 9bbde35f6..1c202ac5f 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/BookmarksActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/BookmarksActivityTest.java
@@ -1,10 +1,10 @@
 package org.kiwix.kiwixmobile.tests.activities;
 
 import android.Manifest;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.bookmark.BookmarksActivity;
 @RunWith(AndroidJUnit4.class)
 public class BookmarksActivityTest {
 
-    @Rule
-    public ActivityTestRule<BookmarksActivity> mActivityTestRule = new ActivityTestRule<>(
-            BookmarksActivity.class);
-    @Rule
-    public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
-    @Rule
-    public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+  @Rule
+  public ActivityTestRule<BookmarksActivity> mActivityTestRule = new ActivityTestRule<>(
+      BookmarksActivity.class);
+  @Rule
+  public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
+  @Rule
+  public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
-    @Test
-    public void BookmarksActivitySimple() {
-
-    }
+  @Test
+  public void BookmarksActivitySimple() {
 
+  }
 }
diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SearchActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SearchActivityTest.java
index 438a949a4..1e8524c21 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SearchActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SearchActivityTest.java
@@ -1,10 +1,10 @@
 package org.kiwix.kiwixmobile.tests.activities;
 
 import android.Manifest;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.search.SearchActivity;
 @RunWith(AndroidJUnit4.class)
 public class SearchActivityTest {
 
-    @Rule
-    public ActivityTestRule<SearchActivity> mActivityTestRule = new ActivityTestRule<>(
-            SearchActivity.class);
-    @Rule
-    public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
-    @Rule
-    public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+  @Rule
+  public ActivityTestRule<SearchActivity> mActivityTestRule = new ActivityTestRule<>(
+      SearchActivity.class);
+  @Rule
+  public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
+  @Rule
+  public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
-    @Test
-    public void SearchActivitySimple() {
-
-    }
+  @Test
+  public void SearchActivitySimple() {
 
+  }
 }
diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SettingsActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SettingsActivityTest.java
index 8656872f6..e24789743 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SettingsActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/SettingsActivityTest.java
@@ -1,10 +1,10 @@
 package org.kiwix.kiwixmobile.tests.activities;
 
 import android.Manifest;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.settings.KiwixSettingsActivity;
 @RunWith(AndroidJUnit4.class)
 public class SettingsActivityTest {
 
-    @Rule
-    public ActivityTestRule<KiwixSettingsActivity> mActivityTestRule = new ActivityTestRule<>(
-            KiwixSettingsActivity.class);
-    @Rule
-    public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
-    @Rule
-    public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+  @Rule
+  public ActivityTestRule<KiwixSettingsActivity> mActivityTestRule = new ActivityTestRule<>(
+      KiwixSettingsActivity.class);
+  @Rule
+  public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
+  @Rule
+  public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
-    @Test
-    public void SettingsActivitySimple() {
-
-    }
+  @Test
+  public void SettingsActivitySimple() {
 
+  }
 }
diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/ZimManageActivityTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/ZimManageActivityTest.java
index ff22e83c1..57d8b4e31 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/ZimManageActivityTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/activities/ZimManageActivityTest.java
@@ -1,10 +1,10 @@
 package org.kiwix.kiwixmobile.tests.activities;
 
 import android.Manifest;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity;
 @RunWith(AndroidJUnit4.class)
 public class ZimManageActivityTest {
 
-    @Rule
-    public ActivityTestRule<ZimManageActivity> mActivityTestRule = new ActivityTestRule<>(
-            ZimManageActivity.class);
-    @Rule
-    public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
-    @Rule
-    public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+  @Rule
+  public ActivityTestRule<ZimManageActivity> mActivityTestRule = new ActivityTestRule<>(
+      ZimManageActivity.class);
+  @Rule
+  public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
+  @Rule
+  public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
-    @Test
-    public void ZimManageActivitySimple() {
-
-    }
+  @Test
+  public void ZimManageActivitySimple() {
 
+  }
 }