diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 49802c4d7..7ce3f445b 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -10420,15 +10420,13 @@ toughness=2
 [card]
 name=Covetous Dragon
 abilities=flying
-auto=aslongas(artifact|myBattlefield) moveTo(mygraveyard) <1
-auto=@movedTo(artifact|graveyard,exile,library,hand) from(myBattlefield):aslongas(artifact|myBattlefield) moveTo(mygraveyard) <1
+auto=aslongas(artifact|myBattlefield) -99/-99 <1
 text=Flying -- When you control no artifacts, sacrifice Covetous Dragon.
 mana={4}{R}
 type=Creature
 subtype=Dragon
 power=6
 toughness=5
-# P/T modified to make auto rule possible
 [/card]
 [card]
 name=Crabapple Cohort
@@ -15288,6 +15286,7 @@ toughness=1
 [card]
 name=Elvish Berserker
 auto=rampage(1/1,0)
+auto=aslongas(artifact|myBattlefield) -99/-99 <1
 text=Whenever Elvish Berserker becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
 mana={G}
 type=Creature
diff --git a/projects/mtg/bin/Res/test/Auriok_Sunchaser_ASLONGAS_1.txt b/projects/mtg/bin/Res/test/Auriok_Sunchaser_ASLONGAS_1.txt
new file mode 100644
index 000000000..90f35ac01
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Auriok_Sunchaser_ASLONGAS_1.txt
@@ -0,0 +1,26 @@
+#test originally coded to prove aslongas was broken, it is corrected now. this test now shows that he remains a 3/3 and survives.
+
+#Test to confirm that "aslongas" in combination with ">" works.
+#You control 4 arifacts and Auriok Sunchaser. It is 3/3 due to its Metalcraft bonus (+2/+2).
+#1 of the 4 artifacts gets destroyed by Shatter. Auriok Sunchaser should stay 3/3 because there are still enough artifacts on your side. 
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Auriok Sunchaser,Bottle Gnomes,Mox Pearl,Bonesplitter,Mox Emerald
+hand:Shatter,Shock
+manapool:{1}{R}{R}
+[PLAYER2]
+[DO]
+Shatter
+Mox Pearl
+Shock
+Auriok Sunchaser
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Bottle Gnomes,Bonesplitter,Mox Emerald,Auriok Sunchaser
+graveyard:Shatter,Mox Pearl,Shock
+manapool:{0}
+life:20
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/Auriok_Sunchaser_ASLONGAS_2.txt b/projects/mtg/bin/Res/test/Auriok_Sunchaser_ASLONGAS_2.txt
new file mode 100644
index 000000000..c1b9d6514
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Auriok_Sunchaser_ASLONGAS_2.txt
@@ -0,0 +1,24 @@
+#Test to confirm that "aslongas" in combination with ">" works.
+#You control 3 arifacts and Auriok Sunchaser. It is 3/3 due to its Metalcraft bonus (+2/+2).
+#1 of the 3 artifacts gets destroyed by Shatter. Auriok Sunchaser should lose the Metalcraft bonus because there are not enough artifacts on your side anymore. 
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Auriok Sunchaser,Bottle Gnomes,Mox Pearl,Bonesplitter
+hand:Shatter,Shock
+manapool:{1}{R}{R}
+[PLAYER2]
+[DO]
+Shatter
+Mox Pearl
+Shock
+Auriok Sunchaser
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Bottle Gnomes,Bonesplitter
+graveyard:Shatter,Mox Pearl,Shock,Auriok Sunchaser
+manapool:{0}
+life:20
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/Covetous_Dragon_ASLONGAS_3.txt b/projects/mtg/bin/Res/test/Covetous_Dragon_ASLONGAS_3.txt
new file mode 100644
index 000000000..22c936d83
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Covetous_Dragon_ASLONGAS_3.txt
@@ -0,0 +1,22 @@
+#Test to confirm that "aslongas" in combination with "<" works.
+#You control 3 arifacts and Covetous Dragon. 1 of the 3 artifacts gets destroyed by Shatter.
+#Covetous Dragon should stay on the battlefield.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Covetous Dragon,Bottle Gnomes,Mox Pearl,Bonesplitter
+hand:Shatter
+manapool:{1}{R}
+[PLAYER2]
+[DO]
+Shatter
+Mox Pearl
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Bottle Gnomes,Bonesplitter,Covetous Dragon
+graveyard:Shatter,Mox Pearl
+manapool:{0}
+life:20
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/Covetous_Dragon_ASLONGAS_4.txt b/projects/mtg/bin/Res/test/Covetous_Dragon_ASLONGAS_4.txt
new file mode 100644
index 000000000..a87ed8747
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Covetous_Dragon_ASLONGAS_4.txt
@@ -0,0 +1,21 @@
+#Test to confirm that "aslongas" in combination with "<" works.
+#You control 1 arifact and Covetous Dragon. The artifact gets destroyed by Shatter.
+#Covetous Dragon should go to the graveyard.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Covetous Dragon,Mox Pearl
+hand:Shatter
+manapool:{1}{R}
+[PLAYER2]
+[DO]
+Shatter
+Mox Pearl
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Shatter,Mox Pearl,Covetous Dragon
+manapool:{0}
+life:20
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/Glimmervoid_ASLONGAS&TRIGGER.txt b/projects/mtg/bin/Res/test/Glimmervoid_ASLONGAS&TRIGGER.txt
new file mode 100644
index 000000000..9e72ea869
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Glimmervoid_ASLONGAS&TRIGGER.txt
@@ -0,0 +1,20 @@
+#Testing Glimmervoid
+[INIT]
+SECONDMAIN
+[PLAYER1]
+inplay:Swamp,Glimmervoid,Bottle Gnomes
+[PLAYER2]
+life:20
+[DO]
+Bottle Gnomes
+next
+next
+[ASSERT]
+CLEANUP
+[PLAYER1]
+inplay:Swamp
+graveyard:Glimmervoid,Bottle Gnomes
+life:23
+[PLAYER2]
+life:20
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 62e3c3a9e..05c2f55f8 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -111,7 +111,8 @@ ascendant_evincar3.txt
 ashen_firebeast.txt
 ashen_firebeast2.txt
 aura_mutation.txt
-auriok_sunchaser_aslongas_bug.txt
+Auriok_Sunchaser_ASLONGAS_1.txt
+Auriok_Sunchaser_ASLONGAS_2.txt
 avarice_totem.txt
 aven_riftwatcher.txt
 aven_riftwatcher2.txt
@@ -182,6 +183,8 @@ counterspell.txt
 counterspell2.txt
 counterspell3.txt
 counterspell4.txt
+Covetous_Dragon_ASLONGAS_3.txt
+Covetous_Dragon_ASLONGAS_4.txt
 cranial_plating.txt
 creature_bond.txt
 curiosity1_i217.txt
@@ -264,7 +267,7 @@ ghost_warden.txt
 glen_elendra_archmage_i222.txt
 giant_growth.txt
 giant_growth2.txt
-Glimmervoid.txt
+Glimmervoid_ASLONGAS&TRIGGER.txt
 glimpse_the_unthinkable.txt
 gnarled_effigy.txt
 gnat_alley_creeper1.txt