diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java
index cbec38da4..48b8c22c3 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java
@@ -1,4 +1,3 @@
-
 package org.fdroid.fdroid.updater;
 
 import android.content.ContentValues;
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
index e659549a6..195a1c262 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
@@ -66,7 +66,7 @@ public class AppIconsTest extends MultiIndexUpdaterTest {
 
     private void assertIconUrl(String expectedUrl) {
         App app = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(),
-                "org.adaway", new String[] {Schema.AppMetadataTable.Cols.ICON_URL});
+                "org.adaway", new String[]{Schema.AppMetadataTable.Cols.ICON_URL});
 
         assertEquals(app.iconUrl, expectedUrl);
     }
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
index 898f6d7fb..a332f4daf 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
@@ -1,4 +1,3 @@
-
 package org.fdroid.fdroid.updater;
 
 import org.fdroid.fdroid.BuildConfig;
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
index 5eb61fa7b..277d521ca 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
@@ -1,6 +1,5 @@
 package org.fdroid.fdroid.updater;
 
-import android.content.ContentValues;
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.IndexUpdater;
 import org.fdroid.fdroid.data.Apk;
@@ -105,7 +104,7 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
     private void assertAntoxExists() {
         String packageName = "chat.tox.antox";
         List<Apk> actualApksAfterUpdate = ApkProvider.Helper.findByRepo(context, antoxRepo, Schema.ApkTable.Cols.ALL);
-        int[] expectedVersions = new int[] {15421};
+        int[] expectedVersions = new int[]{15421};
 
         assertApp(packageName, expectedVersions);
         assertApksExist(actualApksAfterUpdate, packageName, expectedVersions);
@@ -115,17 +114,17 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
         List<Apk> actualApksAfterUpdate = ApkProvider.Helper.findByRepo(context, microGRepo, Schema.ApkTable.Cols.ALL);
 
         String vendingPackage = "com.android.vending";
-        int[] expectedVendingVersions = new int[] {1};
+        int[] expectedVendingVersions = new int[]{1};
         assertApp(vendingPackage, expectedVendingVersions);
         assertApksExist(actualApksAfterUpdate, vendingPackage, expectedVendingVersions);
 
         String gmsPackage = "com.google.android.gms";
-        int[] expectedGmsVersions = new int[] {11059462, 10545451, 10545440, 10087438, 10087435, 9258259, 8492252, };
+        int[] expectedGmsVersions = new int[]{11059462, 10545451, 10545440, 10087438, 10087435, 9258259, 8492252};
         assertApp(gmsPackage, expectedGmsVersions);
         assertApksExist(actualApksAfterUpdate, gmsPackage, expectedGmsVersions);
 
         String gsfPackage = "com.google.android.gsf";
-        int[] expectedGsfVersions = new int[] {8};
+        int[] expectedGsfVersions = new int[]{8};
         assertApp(gsfPackage, expectedGsfVersions);
         assertApksExist(actualApksAfterUpdate, gsfPackage, expectedGsfVersions);
     }
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java
index 2742dec5e..60f0cf9c4 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java
@@ -1,14 +1,13 @@
-
 package org.fdroid.fdroid.updater;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
-import org.fdroid.fdroid.IndexV1Updater;
-import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.IndexUpdater;
 import org.fdroid.fdroid.IndexUpdater.UpdateException;
+import org.fdroid.fdroid.IndexV1Updater;
+import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.ApkProvider;
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java
index 36b16d373..eab73ed39 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java
@@ -1,4 +1,3 @@
-
 package org.fdroid.fdroid.updater;
 
 import android.content.ContentValues;
@@ -41,7 +40,8 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
 
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({"Conflicting", "Normal"})
-    public @interface RepoIdentifier { }
+    public @interface RepoIdentifier {
+    }
 
     @Test
     public void appsRemovedFromRepo() throws IndexUpdater.UpdateException {
@@ -310,7 +310,9 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
         assertAdAwayMetadata(adaway, id);
     }
 
-    /** @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String) */
+    /**
+     * @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String)
+     */
     private void assertAdAwayMetadata(App adaway, @RepoIdentifier String id) {
         assertNotNull(adaway);
         assertEquals(String.format("AdAway", id),
@@ -338,7 +340,9 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
         assertAdbMetadata(adb, id);
     }
 
-    /** @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String) */
+    /**
+     * @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String)
+     */
     private void assertAdbMetadata(App adb, @RepoIdentifier String id) {
         assertNotNull(adb);
         assertEquals("adbWireless", adb.name);
@@ -355,7 +359,9 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
         assertCalendarMetadata(calendar, id);
     }
 
-    /** @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String) */
+    /**
+     * @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String)
+     */
     private void assertCalendarMetadata(App calendar, @RepoIdentifier String id) {
         assertNotNull(calendar);
         assertEquals("Add to calendar",