diff --git a/Mage.Sets/src/mage/cards/d/DaringThief.java b/Mage.Sets/src/mage/cards/d/DaringThief.java
index 126138f0633..42e82da88d3 100644
--- a/Mage.Sets/src/mage/cards/d/DaringThief.java
+++ b/Mage.Sets/src/mage/cards/d/DaringThief.java
@@ -88,6 +88,7 @@ class TargetControlledPermanentSharingOpponentPermanentCardType extends TargetCo
     
     public TargetControlledPermanentSharingOpponentPermanentCardType() {
         super();
+        this.filter = this.filter.copy();
         filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
         setTargetName("nonland permanent you control");
     }  
@@ -155,6 +156,7 @@ class DaringThiefSecondTarget extends TargetPermanent {
             
     public DaringThiefSecondTarget() {
         super();
+        this.filter = this.filter.copy();
         filter.add(new ControllerPredicate(TargetController.OPPONENT));
         setTargetName("permanent an opponent controls that shares a card type with it");
    }
diff --git a/Mage.Sets/src/mage/cards/p/PucasMischief.java b/Mage.Sets/src/mage/cards/p/PucasMischief.java
index 81082585e94..e6ae593de83 100644
--- a/Mage.Sets/src/mage/cards/p/PucasMischief.java
+++ b/Mage.Sets/src/mage/cards/p/PucasMischief.java
@@ -81,6 +81,7 @@ class TargetControlledPermanentWithCMCGreaterOrLessThanOpponentPermanent extends
 
     public TargetControlledPermanentWithCMCGreaterOrLessThanOpponentPermanent() {
         super();
+        this.filter = this.filter.copy();
         filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
         setTargetName("nonland permanent you control");
     }
@@ -118,6 +119,7 @@ class PucasMischiefSecondTarget extends TargetPermanent {
 
     public PucasMischiefSecondTarget() {
         super();
+        this.filter = this.filter.copy();
         filter.add(new ControllerPredicate(TargetController.OPPONENT));
         filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
         setTargetName("permanent an opponent controls with an equal or lesser converted mana cost");
diff --git a/Mage.Sets/src/mage/cards/s/Spawnbroker.java b/Mage.Sets/src/mage/cards/s/Spawnbroker.java
index fcd1688cf4f..efae9a13efb 100644
--- a/Mage.Sets/src/mage/cards/s/Spawnbroker.java
+++ b/Mage.Sets/src/mage/cards/s/Spawnbroker.java
@@ -86,6 +86,7 @@ class TargetControlledCreatureWithPowerGreaterOrLessThanOpponentPermanent extend
 
     public TargetControlledCreatureWithPowerGreaterOrLessThanOpponentPermanent() {
         super();
+        this.filter = this.filter.copy();
         filter.add(new CardTypePredicate(CardType.CREATURE));
         setTargetName("creature you control");
     }
@@ -123,6 +124,7 @@ class SpawnbrokerSecondTarget extends TargetPermanent {
 
     public SpawnbrokerSecondTarget() {
         super();
+        this.filter = this.filter.copy();
         filter.add(new ControllerPredicate(TargetController.OPPONENT));
         filter.add(new CardTypePredicate(CardType.CREATURE));
         setTargetName("creature with power less than or equal to that creature's power an opponent controls");
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
index 5aeaadc33dd..21e95570f80 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
@@ -63,6 +63,16 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
         UNKNOWN
     }
 
+    public CardTestPlayerAPIImpl(){
+        // load all cards to db from class list
+        ArrayList<String> errorsList = new ArrayList<>();
+        CardScanner.scan(errorsList);
+
+        if (errorsList.size() > 0) {
+            Assert.fail("Found errors on card loading: " + '\n' + errorsList.stream().collect(Collectors.joining("\n")));
+        }
+    }
+
     /**
      * Default game initialization params for red player (that plays with
      * Mountains)
@@ -108,17 +118,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
         addCard(Zone.LIBRARY, playerB, "Plains", 10);
     }
 
-    @Before
-    public void checkDatabase() {
-        // load all cards to db from class list
-        ArrayList<String> errorsList = new ArrayList<>();
-        CardScanner.scan(errorsList);
-
-        if (errorsList.size() > 0) {
-            Assert.fail("Found errors on card loading: " + '\n' + errorsList.stream().collect(Collectors.joining("\n")));
-        }
-    }
-
     @Before
     public void reset() throws GameException, FileNotFoundException {
         if (currentGame != null) {