diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json
index a2aa0599b..a12645b8e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json
@@ -128,11 +128,13 @@
 			{
 	      "type": "activated",
 	      "phase": "archery",
-	      "cost": {
-	        "type": "reduceArcheryTotal",
-	        "side": "free people",
-	        "memorize": "reducedBy"
-	      },
+	      "cost": [
+	      	{
+		        "type": "reduceArcheryTotal",
+		        "side": "free people",
+		        "memorize": "reducedBy"
+	      	}
+	    	],
 	      "effect": [
 	      	{
 		        "type": "modifyStrength",
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
index 73524bf05..abcd86c11 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
@@ -9,6 +9,7 @@ import com.gempukku.lotro.logic.modifiers.ModifierFlag;
 import com.gempukku.lotro.logic.timing.GameStats;
 import org.apache.log4j.Logger;
 
+import java.security.InvalidParameterException;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -311,12 +312,18 @@ public class GameState {
             listener.cardMoved(card);
     }
 
-    public void attachCard(LotroGame game, PhysicalCard card, PhysicalCard attachTo) {
+    public void attachCard(LotroGame game, PhysicalCard card, PhysicalCard attachTo) throws InvalidParameterException {
+        if(card == attachTo)
+            throw new InvalidParameterException("Cannot attach card to itself!");
+
         ((PhysicalCardImpl) card).attachTo((PhysicalCardImpl) attachTo);
         addCardToZone(game, card, Zone.ATTACHED);
     }
 
-    public void stackCard(LotroGame game, PhysicalCard card, PhysicalCard stackOn) {
+    public void stackCard(LotroGame game, PhysicalCard card, PhysicalCard stackOn) throws InvalidParameterException {
+        if(card == stackOn)
+            throw new InvalidParameterException("Cannot stack card on itself!");
+
         ((PhysicalCardImpl) card).stackOn((PhysicalCardImpl) stackOn);
         addCardToZone(game, card, Zone.STACKED);
     }
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_009_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_009_Tests.java
index b85956331..47b0fe296 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_009_Tests.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_009_Tests.java
@@ -22,8 +22,13 @@ public class Card_V1_009_Tests
 		return new GenericCardTestHelper(
 				new HashMap<String, String>()
 				{{
-					put("card", "151_9");
-					// put other cards in here as needed for the test case
+					put("legolas", "151_9");
+					put("lorien", "51_53");
+					put("bow", "1_41");
+					put("aragorn", "1_89");
+					put("gornbow", "1_90");
+
+					put("runner", "1_178");
 				}},
 				GenericCardTestHelper.FellowshipSites,
 				GenericCardTestHelper.FOTRFrodo,
@@ -31,7 +36,6 @@ public class Card_V1_009_Tests
 		);
 	}
 
-	// Uncomment both @Test markers below once this is ready to be used
 
 	@Test
 	public void LegolasStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException {
@@ -54,32 +58,54 @@ public class Card_V1_009_Tests
 		//Pre-game setup
 		GenericCardTestHelper scn = GetScenario();
 
-		PhysicalCardImpl card = scn.GetFreepsCard("card");
+		PhysicalCardImpl legolas = scn.GetFreepsCard("legolas");
 
-		assertTrue(card.getBlueprint().isUnique());
-		assertTrue(scn.HasKeyword(card, Keyword.ARCHER)); // test for keywords as needed
-		assertEquals(2, card.getBlueprint().getTwilightCost());
-		assertEquals(6, card.getBlueprint().getStrength());
-		assertEquals(3, card.getBlueprint().getVitality());
-		//assertEquals(, card.getBlueprint().getResistance());
-		assertEquals(Signet.ARAGORN, card.getBlueprint().getSignet()); 
-		//assertEquals(, card.getBlueprint().getSiteNumber()); // Change this to getAllyHomeSiteNumbers for allies
-		assertEquals(CardType.COMPANION, card.getBlueprint().getCardType());
-		assertEquals(Culture.ELVEN, card.getBlueprint().getCulture());
-		assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide());
+		assertTrue(legolas.getBlueprint().isUnique());
+		assertTrue(scn.HasKeyword(legolas, Keyword.ARCHER)); // test for keywords as needed
+		assertEquals(2, legolas.getBlueprint().getTwilightCost());
+		assertEquals(6, legolas.getBlueprint().getStrength());
+		assertEquals(3, legolas.getBlueprint().getVitality());
+		//assertEquals(, legolas.getBlueprint().getResistance());
+		assertEquals(Signet.ARAGORN, legolas.getBlueprint().getSignet()); 
+		//assertEquals(, legolas.getBlueprint().getSiteNumber()); // Change this to getAllyHomeSiteNumbers for allies
+		assertEquals(CardType.COMPANION, legolas.getBlueprint().getCardType());
+		assertEquals(Culture.ELVEN, legolas.getBlueprint().getCulture());
+		assertEquals(Side.FREE_PEOPLE, legolas.getBlueprint().getSide());
 	}
 
-	//@Test
-	public void LegolasTest1() throws DecisionResultInvalidException, CardNotFoundException {
+	@Test
+	public void ArcheryLosesFireToPumpLegolas() throws DecisionResultInvalidException, CardNotFoundException {
 		//Pre-game setup
 		GenericCardTestHelper scn = GetScenario();
 
-		PhysicalCardImpl card = scn.GetFreepsCard("card");
-		scn.FreepsMoveCardToHand(card);
+		PhysicalCardImpl legolas = scn.GetFreepsCard("legolas");
+		PhysicalCardImpl lorien = scn.GetFreepsCard("lorien");
+		PhysicalCardImpl bow = scn.GetFreepsCard("bow");
+		PhysicalCardImpl aragorn = scn.GetFreepsCard("aragorn");
+		PhysicalCardImpl gornbow = scn.GetFreepsCard("gornbow");
+
+		scn.FreepsMoveCharToTable(legolas, lorien, aragorn);
+		scn.FreepsAttachCardsTo(aragorn, "gornbow");
+		scn.FreepsAttachCardsTo(lorien, "bow");
+
+		scn.ShadowMoveCharToTable("runner");
 
 		scn.StartGame();
-		scn.FreepsPlayCard(card);
 
-		assertEquals(2, scn.GetTwilight());
+		scn.SkipToPhase(Phase.ARCHERY);
+		assertTrue(scn.FreepsCardActionAvailable(legolas));
+		assertEquals(3, scn.GetFreepsArcheryTotal());
+		assertEquals(6, scn.GetStrength(legolas));
+
+		scn.FreepsUseCardAction(legolas);
+		assertTrue(scn.FreepsDecisionAvailable("Choose number to reduce archery by"));
+		scn.FreepsChoose("2");
+
+		assertEquals(1, scn.GetFreepsArcheryTotal());
+		assertEquals(8, scn.GetStrength(legolas));
+
+		scn.ShadowSkipCurrentPhaseAction();
+
+		assertFalse(scn.FreepsAnyActionsAvailable()); // No gorn bow
 	}
 }