diff --git a/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java b/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java
index ffdf05d37d..67a15cfaee 100644
--- a/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java
+++ b/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java
@@ -1,7 +1,5 @@
-
 package mage.cards.c;
 
-import java.util.UUID;
 import mage.abilities.effects.common.DrawCardTargetEffect;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect;
@@ -10,19 +8,19 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.target.TargetPlayer;
 
+import java.util.UUID;
+
 /**
- *
  * @author North
  */
 public final class CaressOfPhyrexia extends CardImpl {
 
     public CaressOfPhyrexia(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
 
         this.getSpellAbility().addEffect(new DrawCardTargetEffect(3));
-        this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3));
-        this.getSpellAbility().addEffect(new AddPoisonCounterTargetEffect(3));
+        this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3).setText(", loses 3 life"));
+        this.getSpellAbility().addEffect(new AddPoisonCounterTargetEffect(3).setText(", and gets three poison counters"));
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
diff --git a/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java b/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java
index 0e1f8b3603..2127f27c82 100644
--- a/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java
+++ b/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java
@@ -1,10 +1,8 @@
-
 package mage.cards.g;
 
-import java.util.UUID;
+import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.common.UnattachedTriggeredAbility;
-import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.SacrificeEquippedEffect;
 import mage.abilities.effects.common.continuous.BoostEquippedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
@@ -15,29 +13,32 @@ import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.constants.Outcome;
-import mage.constants.Zone;
-import mage.target.common.TargetControlledCreaturePermanent;
+
+import java.util.UUID;
 
 /**
- *
  * @author nantuko
  */
 public final class GraftedExoskeleton extends CardImpl {
 
     public GraftedExoskeleton(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
         this.subtype.add(SubType.EQUIPMENT);
-        
+
         // Equipped creature gets +2/+2 and has infect.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.EQUIPMENT)));
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)));
+        Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2));
+        ability.addEffect(new GainAbilityAttachedEffect(
+                InfectAbility.getInstance(), AttachmentType.EQUIPMENT
+        ).setText("and has infect"));
+        this.addAbility(ability);
 
         // Whenever Grafted Exoskeleton becomes unattached from a permanent, sacrifice that permanent.
-        this.addAbility(new UnattachedTriggeredAbility(new SacrificeEquippedEffect(), false));
+        this.addAbility(new UnattachedTriggeredAbility(
+                new SacrificeEquippedEffect().setText("sacrifice that permanent"), false
+        ));
 
         // Equip {2}
-        this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false));
+        this.addAbility(new EquipAbility(2, false));
     }
 
     private GraftedExoskeleton(final GraftedExoskeleton card) {
diff --git a/Mage.Sets/src/mage/cards/i/IchorclawMyr.java b/Mage.Sets/src/mage/cards/i/IchorclawMyr.java
index c7441c698c..1242f78b10 100644
--- a/Mage.Sets/src/mage/cards/i/IchorclawMyr.java
+++ b/Mage.Sets/src/mage/cards/i/IchorclawMyr.java
@@ -1,7 +1,5 @@
-
 package mage.cards.i;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.BecomesBlockedSourceTriggeredAbility;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
@@ -9,17 +7,18 @@ import mage.abilities.keyword.InfectAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Duration;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
- *
  * @author North
  */
 public final class IchorclawMyr extends CardImpl {
 
     public IchorclawMyr(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}");
         this.subtype.add(SubType.PHYREXIAN);
         this.subtype.add(SubType.MYR);
 
@@ -28,7 +27,9 @@ public final class IchorclawMyr extends CardImpl {
 
         this.addAbility(InfectAbility.getInstance());
         // Whenever Ichorclaw Myr becomes blocked, it gets +2/+2 until end of turn.
-        this.addAbility(new BecomesBlockedSourceTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false));
+        this.addAbility(new BecomesBlockedSourceTriggeredAbility(
+                new BoostSourceEffect(2, 2, Duration.EndOfTurn, "it"), false
+        ));
     }
 
     private IchorclawMyr(final IchorclawMyr card) {
diff --git a/Mage.Sets/src/mage/cards/n/NornsAnnex.java b/Mage.Sets/src/mage/cards/n/NornsAnnex.java
index 017354b155..6212fcb645 100644
--- a/Mage.Sets/src/mage/cards/n/NornsAnnex.java
+++ b/Mage.Sets/src/mage/cards/n/NornsAnnex.java
@@ -20,7 +20,9 @@ public final class NornsAnnex extends CardImpl {
 
         // {W/P} ({W/P} can be paid with either or 2 life.)
         // Creatures can't attack you or a planeswalker you control unless their controller pays {W/P} for each of those creatures.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouUnlessPayAllEffect(new ManaCostsImpl<>("{W/P}"), true)));
+        this.addAbility(new SimpleStaticAbility(new CantAttackYouUnlessPayAllEffect(
+                new ManaCostsImpl<>("{W/P}"), true
+        ).setText("creatures can't attack you or planeswalkers you control unless their controller pays {W/P} for each of those creatures")));
     }
 
     private NornsAnnex(final NornsAnnex card) {
diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
index 7f91b53e7d..ac8bcee885 100644
--- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
+++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
@@ -58,7 +58,7 @@ public class VerifyCardDataTest {
 
     private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class);
 
-    private static final String FULL_ABILITIES_CHECK_SET_CODE = "40K"; // check all abilities and output cards with wrong abilities texts;
+    private static final String FULL_ABILITIES_CHECK_SET_CODE = "ONC"; // check all abilities and output cards with wrong abilities texts;
     private static final boolean CHECK_ONLY_ABILITIES_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages
 
     private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run