diff --git a/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java
index d97d346728f..17b78412071 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java
@@ -1,18 +1,29 @@
 package forge.card;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 import com.google.common.base.Predicate;
+
 import forge.StaticData;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.model.FModel;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.*;
-
-import static org.testng.Assert.*;
 
 public class CardDbCardMockTestCase extends CardMockTestCase {
 
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardDbLazyCardLoadingCardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardDbLazyCardLoadingCardMockTestCase.java
index 0e22194c833..99bcdd11a66 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardDbLazyCardLoadingCardMockTestCase.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardDbLazyCardLoadingCardMockTestCase.java
@@ -1,14 +1,17 @@
 package forge.card;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 import forge.StaticData;
 import forge.gamesimulationtests.util.CardDatabaseHelper;
 import forge.item.PaperCard;
 import forge.model.FModel;
-import org.powermock.api.mockito.PowerMockito;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
 
 public class CardDbLazyCardLoadingCardMockTestCase extends CardMockTestCase {
 
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardDbPerformanceTests.java b/forge-gui-desktop/src/test/java/forge/card/CardDbPerformanceTests.java
index 146f7396dc4..9914b1d3eb2 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardDbPerformanceTests.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardDbPerformanceTests.java
@@ -1,14 +1,15 @@
 package forge.card;
 
-import forge.item.PaperCard;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertNotNull;
 
 import java.util.Collection;
 import java.util.Set;
 import java.util.TreeSet;
 
-import static org.testng.Assert.assertNotNull;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import forge.item.PaperCard;
 
 public class CardDbPerformanceTests  extends CardDbCardMockTestCase {
 
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardDbWithNoImageCardDbMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardDbWithNoImageCardDbMockTestCase.java
index 3495c61c034..8a3be86a911 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardDbWithNoImageCardDbMockTestCase.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardDbWithNoImageCardDbMockTestCase.java
@@ -1,17 +1,18 @@
 package forge.card;
 
-import forge.ImageCache;
-import forge.ImageKeys;
-import forge.item.PaperCard;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+
+import javax.imageio.ImageIO;
+
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.imageio.ImageIO;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
+import forge.ImageCache;
+import forge.ImageKeys;
+import forge.item.PaperCard;
 
 /**
  * Test Case for CardDb forcing No Image for all the cards.
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java
index 133ed308c67..a088013351d 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java
@@ -1,14 +1,15 @@
 package forge.card;
 
-import forge.deck.CardPool;
-import forge.item.PaperCard;
-import forge.model.FModel;
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+import forge.deck.CardPool;
+import forge.item.PaperCard;
+import forge.model.FModel;
 
 public class CardEditionCollectionCardMockTestCase extends CardMockTestCase {
 
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
index 18cb876dba3..f82cec1102b 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
@@ -1,5 +1,25 @@
 package forge.card;
 
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.lang3.StringUtils;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.testng.PowerMockTestCase;
+import org.testng.IObjectFactory;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.ObjectFactory;
+
 import forge.ImageCache;
 import forge.ImageKeys;
 import forge.Singletons;
@@ -11,24 +31,6 @@ import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
 import forge.util.Localizer;
 import forge.util.TextUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
-import org.powermock.modules.testng.PowerMockTestCase;
-import org.testng.IObjectFactory;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.ObjectFactory;
-
-import javax.imageio.ImageIO;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.ResourceBundle;
 
 @PrepareForTest(value = {FModel.class, Singletons.class, ResourceBundle.class,
         ImageCache.class, ImageIO.class, ImageKeys.class,
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardRequestTest.java b/forge-gui-desktop/src/test/java/forge/card/CardRequestTest.java
index 5ee5a3bbae8..be61d7e0f8c 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardRequestTest.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardRequestTest.java
@@ -1,11 +1,16 @@
 package forge.card;
 
-import forge.card.CardDb.CardRequest;
-import forge.item.IPaperCard;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.*;
+import forge.card.CardDb.CardRequest;
+import forge.item.IPaperCard;
 
 @Test(timeOut = 1000, enabled = true)
 public class CardRequestTest {
diff --git a/forge-gui-desktop/src/test/java/forge/card/LegacyCardDb.java b/forge-gui-desktop/src/test/java/forge/card/LegacyCardDb.java
index 876910c870d..61ff7ebaa63 100644
--- a/forge-gui-desktop/src/test/java/forge/card/LegacyCardDb.java
+++ b/forge-gui-desktop/src/test/java/forge/card/LegacyCardDb.java
@@ -1,18 +1,24 @@
 package forge.card;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimaps;
+
 import forge.item.PaperCard;
 import forge.util.Aggregates;
 import forge.util.CollectionSuppliers;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.*;
 
 /**
  * Test Class (only for test purposes) to compare previous method implementations