diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 18d13241e..4fc535592 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -42103,15 +42103,15 @@ toughness=6
 [/card]
 [card]
 name=Primeval Titan's Fetch
-auto=@movedto(this|mygraveyard):may moveto(mybattlefield) target(land|mylibrary)&& tap && token(-20502712)
-auto=moveto(mygraveyard) all(this)
+auto=@movedto(this|exile):may moveto(mybattlefield) target(land|mylibrary)&& tap && token(-20502712)
+auto=moveto(exile)
 id=-20502711
 type=Nothing
 [/card]
 [card]
 name=Primeval Titan's 2nd Fetch
-auto=@movedto(this|mygraveyard):may moveto(mybattlefield) target(land|mylibrary) && tap
-auto=moveto(mygraveyard) all(this)
+auto=@movedto(this|exile):may moveto(mybattlefield) target(land|mylibrary) && tap
+auto=moveto(exile)
 id=-20502712
 type=Nothing
 [/card]
@@ -54858,8 +54858,8 @@ toughness=4
 [card]
 name=Sun Titan
 abilities=vigilance
-auto=may moveTo(myBattlefield) target(*[manacost<=3]|mygraveyard)
-auto=@attacking(this):may moveTo(myBattlefield) target(*[manacost<=3]|mygraveyard)
+auto=may moveTo(myBattlefield) target(*[manacost<=3;-sorcery;-instant]|mygraveyard)
+auto=@attacking(this):may moveTo(myBattlefield) target(*[manacost<=3;-sorcery;-instant]|mygraveyard)
 text=Vigilance -- Whenever Sun Titan enters the battlefield or attacks, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield.
 mana={4}{W}{W}
 type=Creature
diff --git a/projects/mtg/bin/Res/test/primeval_titan_1.txt b/projects/mtg/bin/Res/test/primeval_titan_1.txt
new file mode 100644
index 000000000..68d4dde1f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/primeval_titan_1.txt
@@ -0,0 +1,23 @@
+## Test Primeval Titan's "Entering the battlefield" ability
+## Should result in bringing in two lands from player's library tapped onto the battlefield
+[init]
+firstmain
+[player1]
+library:forest,plains,swamp
+hand:primeval titan
+manapool:{G}{G}{4}
+[player2]
+[do]
+primeval titan
+choice 0
+choice 0
+swamp
+choice 0
+plains
+[assert]
+firstmain
+[player1]
+inplay:primeval titan,swamp,plains
+library:forest
+[player2]
+[end]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/primeval_titan_2.txt b/projects/mtg/bin/Res/test/primeval_titan_2.txt
new file mode 100644
index 000000000..701afb048
--- /dev/null
+++ b/projects/mtg/bin/Res/test/primeval_titan_2.txt
@@ -0,0 +1,26 @@
+## Test Primeval Titan's "On attacking" ability
+## Should result in bringing in two lands into play tapped
+[init]
+combatbegin
+[player1]
+library:forest,plains,swamp
+inplay:primeval titan
+manapool:{G}{G}{4}
+[player2]
+[do]
+next
+primeval titan
+choice 0
+next
+choice 0
+swamp
+choice 0
+plains
+eot
+[assert]
+untap
+[player1]
+inplay:primeval titan,swamp,plains
+library:forest
+[player2]
+[end]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/sun_titan_1.txt b/projects/mtg/bin/Res/test/sun_titan_1.txt
new file mode 100644
index 000000000..76d52f047
--- /dev/null
+++ b/projects/mtg/bin/Res/test/sun_titan_1.txt
@@ -0,0 +1,19 @@
+## Test Sun Titan's "Entering the battlefield" ability
+## Should result in bringing in a permanent with <= 3 CMC onto the battlefield
+[init]
+firstmain
+[player1]
+graveyard:trinket mage
+hand:sun titan
+manapool:{W}{W}{4}
+[player2]
+[do]
+sun titan
+choice 0
+trinket mage
+[assert]
+firstmain
+[player1]
+inplay:sun titan,trinket mage
+[player2]
+[end]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/sun_titan_2.txt b/projects/mtg/bin/Res/test/sun_titan_2.txt
new file mode 100644
index 000000000..2c5c355f2
--- /dev/null
+++ b/projects/mtg/bin/Res/test/sun_titan_2.txt
@@ -0,0 +1,24 @@
+## Test Sun Titan's "On attacking" ability
+## Should result in bringing in a permanent with <= 3 CMC onto the battlefield
+[init]
+firstmain
+[player1]
+graveyard:forest,trinket mage
+inplay:sun titan
+manapool:{W}{W}{4}
+[player2]
+[do]
+next
+next
+sun titan
+next
+choice 0
+trinket mage
+eot
+[assert]
+untap
+[player1]
+inplay:sun titan,trinket mage
+graveyard:forest
+[player2]
+[end]
\ No newline at end of file