diff --git a/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java b/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java
index 060949e75db..ac245708ce3 100644
--- a/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java
+++ b/Mage.Sets/src/mage/sets/dissension/ProclamationOfRebirth.java
@@ -30,7 +30,6 @@ package mage.sets.dissension;
 import java.util.UUID;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
-import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
 import mage.abilities.keyword.ForecastAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldUnderYourControlTargetEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldUnderYourControlTargetEffectTest.java
new file mode 100644
index 00000000000..fee25268faf
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldUnderYourControlTargetEffectTest.java
@@ -0,0 +1,119 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.triggers;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class ReturnToBattlefieldUnderYourControlTargetEffectTest extends CardTestPlayerBase {
+
+    @Test
+    public void testSaffiEriksdotter() {
+        // Sacrifice Saffi Eriksdotter: When target creature is put into your graveyard from the battlefield this turn, return that card to the battlefield.
+        addCard(Zone.BATTLEFIELD, playerA, "Saffi Eriksdotter");
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
+        addCard(Zone.HAND, playerB, "Lightning Bolt", 1);
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice {this}: When target creature", "Silvercoat Lion");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerA, "Saffi Eriksdotter", 1);
+        assertGraveyardCount(playerB, "Lightning Bolt", 1);
+        assertPermanentCount(playerA, "Silvercoat Lion", 1);
+    }
+
+    /**
+     * That that the creature with a +1/+1 counter returns
+     */
+    @Test
+    public void testMarchesatheBlackRose() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
+        // Whenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step.
+        addCard(Zone.BATTLEFIELD, playerA, "Marchesa, the Black Rose");
+        // Modular 1 (This enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+        addCard(Zone.HAND, playerA, "Arcbound Worker", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
+        addCard(Zone.HAND, playerB, "Lightning Bolt", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcbound Worker");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", "Arcbound Worker");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerB, "Lightning Bolt", 1);
+        assertPermanentCount(playerA, "Arcbound Worker", 1);
+    }
+    /**
+     * That that the creature with a +1/+1 counter does not return
+     * if the card was removed from graveyard meanwhile
+     */
+    @Test
+    public void testMarchesatheBlackRoseAfterExile() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
+        // Whenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step.
+        addCard(Zone.BATTLEFIELD, playerA, "Marchesa, the Black Rose");
+        // Modular 1 (This enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+        addCard(Zone.HAND, playerA, "Arcbound Worker", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
+        addCard(Zone.HAND, playerB, "Lightning Bolt", 1);
+
+        // {T}: Target player exiles a card from his or her graveyard.
+        // {1}, Exile Relic of Progenitus: Exile all cards from all graveyards. Draw a card.
+        addCard(Zone.BATTLEFIELD, playerB, "Relic of Progenitus", 1);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcbound Worker");
+        castSpell(1, PhaseStep.END_COMBAT, playerB, "Lightning Bolt", "Arcbound Worker");
+        
+        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "{T}: Target player exiles", playerA);
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerB, "Lightning Bolt", 1);
+        assertPermanentCount(playerA, "Arcbound Worker", 0);
+
+        assertExileCount("Arcbound Worker", 1);
+        
+    }
+    
+}
\ No newline at end of file