diff --git a/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java b/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java
index 7f1416618ca..ccbfe082f83 100644
--- a/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java
+++ b/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java
@@ -33,13 +33,11 @@ public final class DireFleetWarmonger extends CardImpl {
 
         // At the beginning of combat on your turn, you may sacrifice another creature. If you do, Dire Fleet Warmonger gets +2/+2 and gains trample until end of turn.
         this.addAbility(new BeginningOfCombatTriggeredAbility(new DoIfCostPaid(
-                new BoostSourceEffect(2, 2, Duration.EndOfTurn),
-                new SacrificeTargetCost(new TargetControlledPermanent(
-                        StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE
-                ))
-        ).addEffect(new GainAbilitySourceEffect(
-                TrampleAbility.getInstance(), Duration.EndOfTurn
-        )), TargetController.YOU, true));
+                new BoostSourceEffect(2, 2, Duration.EndOfTurn).setText("{this} gets +2/+2"),
+                new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))
+        ).addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)
+                .concatBy("and").setText("gains trample until end of turn")),
+                TargetController.YOU, false));
     }
 
     private DireFleetWarmonger(final DireFleetWarmonger card) {
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java
index 3cad5814107..f9f6b1a82a7 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java
@@ -15,9 +15,9 @@ public class DireFleetWarmongerTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Dire Fleet Warmonger");
         addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
 
-        setChoice(playerA, "Yes");
         setChoice(playerA, "Yes");
         setChoice(playerA, "Grizzly Bears");
+
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         setStrictChooseMode(true);
         execute();
diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
index cbe19b2bb1a..5b0dda367b6 100644
--- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
+++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
@@ -471,7 +471,7 @@ public class VerifyCardDataTest {
         System.out.println("* MTG sets: " + MtgJson.sets().size() + ", cards: " + mtgCards);
         System.out.println("* Implemented sets: " + mtgSets + ", cards: " + xmageCards);
         System.out.println("* Unsupported sets: " + unsupportedSets + ", cards: " + unsupportedCards);
-        System.out.println("* TODO: " + (MtgJson.sets().size() - mtgSets - unsupportedSets) + ", cards: " + (mtgCards - xmageCards - unsupportedCards));
+        System.out.println("* TODO sets: " + (MtgJson.sets().size() - mtgSets - unsupportedSets) + ", cards: " + (mtgCards - xmageCards - unsupportedCards));
         System.out.println();
         System.out.println("Unofficial sets implementation stats:");
         System.out.println("* Implemented sets: " + xmageUnofficialSets + ", cards: " + xmageUnofficialCards);
@@ -1216,7 +1216,7 @@ public class VerifyCardDataTest {
     public void test_showCardInfo() throws Exception {
         // debug only: show direct card info (takes it from class file, not from db repository)
         // can check multiple cards at once, example: name1;name2;name3
-        String cardNames = "Armed // Dangerous;Beacon Behemoth;Grizzly Bears";
+        String cardNames = "Dire Fleet Warmonger";
         CardScanner.scan();
         Arrays.stream(cardNames.split(";")).forEach(cardName -> {
             cardName = cardName.trim();