diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/BaseTestCase.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/BaseTestCase.kt
index 0edf9a0a9..532f5f28e 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/BaseTestCase.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/BaseTestCase.kt
@@ -8,4 +8,4 @@ class BaseTestCase {
     fun initMocks() {
         MockKAnnotations.init(this, relaxed = true)
     }
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/TestRepositoryModule.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/TestRepositoryModule.kt
index 6535deb9c..be54d85e5 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/TestRepositoryModule.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/TestRepositoryModule.kt
@@ -10,4 +10,4 @@ internal class TestRepositoryModule : RepositoryModule() {
     override fun providesRealm(): Realm {
         return mockk()
     }
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/HealthFormatterTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/HealthFormatterTest.kt
index b21bce589..89353d483 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/HealthFormatterTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/HealthFormatterTest.kt
@@ -4,7 +4,6 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import java.util.Locale
 
-
 class HealthFormatterTest {
     @Test
     fun shouldRoundValuesGreaterThanOneDown() {
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt
index 819ad7fb3..24c1cc351 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.helpers
 
 import android.content.Context
-import com.habitrpg.android.habitica.helpers.NumberAbbreviator.abbreviate
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.NumberAbbreviator.abbreviate
 import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -50,4 +50,4 @@ class NumberAbbreviatorTest {
     fun voidtestThatitRoundsCorrectly() {
         abbreviate(context, 9999.0, 2) shouldBe "9.99k"
     }
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt
index ecee86c33..83e1923c1 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.helpers
 
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.helpers.UserStatComputer.EquipmentRow
-import com.habitrpg.android.habitica.helpers.UserStatComputer.AttributeRow
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.UserStatComputer.AttributeRow
+import com.habitrpg.android.habitica.helpers.UserStatComputer.EquipmentRow
+import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.user.Stats
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -93,4 +93,4 @@ class UserStatComputerTest {
         equipmentList = ArrayList()
         equipmentList.add(equipment)
     }
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.kt
index f821141a2..2fce4b0fc 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.kt
@@ -1,14 +1,11 @@
 package com.habitrpg.android.habitica.models
 
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan
-import org.junit.Before
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import java.lang.Exception
 import java.util.Calendar
 import java.util.Date
-import kotlin.Throws
 
 class SubscriptionPlanTest {
     private var plan: SubscriptionPlan? = null
@@ -44,4 +41,4 @@ class SubscriptionPlanTest {
             plan!!.dateTerminated = calendar.time
             Assertions.assertFalse(plan!!.isActive)
         }
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.kt
index 7592823ef..369b0b9bd 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.kt
@@ -1,14 +1,13 @@
 package com.habitrpg.android.habitica.models
 
 import com.habitrpg.android.habitica.models.user.Items
-
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.models.user.User
+import io.realm.RealmList
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import io.realm.RealmList
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.User
-import org.junit.jupiter.api.Assertions
 
 class UserTest {
     private var user: User? = null
@@ -56,4 +55,4 @@ class UserTest {
         get() {
             Assertions.assertEquals(0, user!!.mountsTamedCount)
         }
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
index 2701bb942..8a8e5cd20 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
@@ -6,10 +6,8 @@ import com.habitrpg.android.habitica.extensions.getTranslatedType
 import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.verify
 import org.junit.jupiter.api.Test
 
-
 private const val FAKE_STANDARD = "Standard"
 private const val FAKE_PREMIUM = "premium"