diff --git a/Mage.Tests/CMDNorinTheWary.dck b/Mage.Tests/CMDNorinTheWary.dck
index 74c3bd1c17..0d468d5dc3 100644
--- a/Mage.Tests/CMDNorinTheWary.dck
+++ b/Mage.Tests/CMDNorinTheWary.dck
@@ -1,75 +1,77 @@
-1 [BOK:108] In the Web of War
-1 [7ED:319] Static Orb
-1 [ALA:101] Goblin Assault
-1 [8ED:204] Obliterate
-1 [ORI:149] Ghirapur Gearcrafter
-1 [SCG:85] Decree of Annihilation
-1 [ONS:317] Forgotten Cave
-1 [MRD:282] Great Furnace
-1 [EVE:179] Springjack Pasture
-1 [VIS:141] Anvil of Bogardan
-1 [JOU:89] Bearer of the Heavens
-1 [ODY:214] Price of Glory
-1 [9ED:176] Blood Moon
-1 [M10:212] Howling Mine
-1 [CMD:114] Chaos Warp
-1 [M12:153] Scrambleverse
-1 [10E:204] Furnace of Rath
-1 [ZEN:228] Valakut, the Molten Pinnacle
-1 [M12:160] Warstorm Surge
-1 [AVR:126] Archwing Dragon
-1 [M15:149] Hoarding Dragon
-1 [4ED:189] Strip Mine
-1 [ORI:145] Fiery Impulse
-1 [CSP:149] Scrying Sheets
-1 [ORI:142] Enthralling Victor
-1 [ORI:144] Fiery Conclusion
-1 [ORI:139] Demolish
-1 [MMQ:320] High Market
-1 [M12:224] Buried Ruin
-1 [TOR:113] Radiate
-1 [M10:163] Warp World
-1 [TSP:188] Word of Seizing
-1 [DST:122] Genesis Chamber
-1 [TSP:275] Kher Keep
-1 [ORI:134] Call of the Full Moon
-1 [ORI:136] Chandra's Fury
-26 [CSP:154] Snow-Covered Mountain
-1 [ONS:212] Gratuitous Violence
-1 [ORI:133] Boggart Brute
-1 [ONS:213] Insurrection
-1 [TMP:210] Tooth and Claw
-1 [ORI:129] Act of Treason
-1 [BOK:120] Twist Allegiance
-1 [CMD:136] Stranglehold
-1 [M13:145] Reverberate
-1 [EXO:102] Shattering Pulse
-1 [9ED:312] Teferi's Puzzle Box
-1 [M14:162] Wild Ricochet
-1 [3ED:274] Sol Ring
-1 [3ED:152] Fork
-1 [DGM:34] Possibility Storm
-1 [USG:188] Gamble
-1 [5ED:64] Smoke
-1 [STH:93] Mogg Infestation
-1 [ULG:80] Goblin Welder
-1 [ALA:119] Vicious Shadows
-1 [ORI:163] Smash to Smithereens
-1 [THS:135] Purphoros, God of the Forge
-1 [CON:136] Font of Mythos
-1 [7ED:307] Meekstone
-1 [TSB:68] Pandemonium
-1 [GTC:248] Thespian's Stage
-1 [3ED:184] Wheel of Fortune
-1 [M15:242] Darksteel Citadel
-1 [M11:160] Wild Evocation
-1 [RTR:111] Vandalblast
-1 [TSP:175] Reiterate
-1 [M14:148] Ogre Battledriver
-1 [ORI:156] Molten Vortex
-1 [MIR:183] Illicit Auction
-1 [ULG:123] Crawlspace
-1 [5ED:246] Jokulhaups
-1 [JOU:93] Dictate of the Twin Gods
-1 [5ED:249] Mana Flare
-SB: 1 [TSP:171] Norin the Wary
+1 [BOK:108] In the Web of War
+1 [7ED:319] Static Orb
+1 [ALA:101] Goblin Assault
+1 [8ED:204] Obliterate
+1 [ORI:149] Ghirapur Gearcrafter
+1 [SCG:85] Decree of Annihilation
+1 [ONS:317] Forgotten Cave
+1 [MRD:282] Great Furnace
+1 [EVE:179] Springjack Pasture
+1 [VIS:141] Anvil of Bogardan
+1 [JOU:89] Bearer of the Heavens
+1 [ODY:214] Price of Glory
+1 [9ED:176] Blood Moon
+1 [M10:212] Howling Mine
+1 [CMD:114] Chaos Warp
+1 [M12:153] Scrambleverse
+1 [10E:204] Furnace of Rath
+1 [ZEN:228] Valakut, the Molten Pinnacle
+1 [M12:160] Warstorm Surge
+1 [AVR:126] Archwing Dragon
+1 [M15:149] Hoarding Dragon
+1 [ORI:145] Fiery Impulse
+1 [CSP:149] Scrying Sheets
+1 [ORI:142] Enthralling Victor
+1 [ORI:144] Fiery Conclusion
+1 [ORI:139] Demolish
+1 [MMQ:320] High Market
+1 [M12:224] Buried Ruin
+1 [TOR:113] Radiate
+1 [M10:163] Warp World
+1 [TSP:188] Word of Seizing
+1 [DST:122] Genesis Chamber
+1 [TSP:275] Kher Keep
+1 [ORI:134] Call of the Full Moon
+1 [ORI:136] Chandra's Fury
+26 [CSP:154] Snow-Covered Mountain
+1 [5ED:268] Smoke
+1 [ONS:212] Gratuitous Violence
+1 [ORI:133] Boggart Brute
+1 [ONS:213] Insurrection
+1 [TMP:210] Tooth and Claw
+1 [ORI:129] Act of Treason
+1 [BOK:120] Twist Allegiance
+1 [CMD:136] Stranglehold
+1 [M13:145] Reverberate
+1 [EXO:102] Shattering Pulse
+1 [9ED:312] Teferi's Puzzle Box
+1 [M14:162] Wild Ricochet
+1 [3ED:274] Sol Ring
+1 [3ED:153] Fork
+1 [DGM:34] Possibility Storm
+1 [4ED:363] Strip Mine
+1 [USG:188] Gamble
+1 [STH:93] Mogg Infestation
+1 [ULG:80] Goblin Welder
+1 [ALA:119] Vicious Shadows
+1 [ORI:163] Smash to Smithereens
+1 [THS:135] Purphoros, God of the Forge
+1 [CON:136] Font of Mythos
+1 [7ED:307] Meekstone
+1 [TSB:68] Pandemonium
+1 [GTC:248] Thespian's Stage
+1 [3ED:185] Wheel of Fortune
+1 [M15:242] Darksteel Citadel
+1 [M11:160] Wild Evocation
+1 [RTR:111] Vandalblast
+1 [TSP:175] Reiterate
+1 [M14:148] Ogre Battledriver
+1 [ORI:156] Molten Vortex
+1 [MIR:183] Illicit Auction
+1 [ULG:123] Crawlspace
+1 [5ED:246] Jokulhaups
+1 [JOU:93] Dictate of the Twin Gods
+1 [5ED:249] Mana Flare
+SB: 1 [TSP:171] Norin the Wary
+LAYOUT MAIN:(2,10)(CMC,true,5)|()([ULG:80])()([ORI:149],[ORI:133])([AVR:126],[ORI:142],[THS:135],[M14:148])([M15:149])()()([JOU:89])()([ONS:317],[MRD:282],[EVE:179],[ZEN:228],[4ED:363],[CSP:149],[MMQ:320],[M12:224],[TSP:275],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[CSP:154],[GTC:248],[M15:242])([ORI:145],[3ED:274],[USG:188],[7ED:307],[RTR:111],[ORI:156])([VIS:141],[M10:212],[ORI:144],[DST:122],[ORI:134],[M13:145],[EXO:102],[3ED:153],[5ED:268],[ORI:163])([7ED:319],[ALA:101],[ODY:214],[9ED:176],[CMD:114],[ORI:129],[3ED:185],[TSP:175],[ULG:123],[5ED:249])([10E:204],[ORI:139],[TMP:210],[CMD:136],[9ED:312],[M14:162],[CON:136],[TSB:68])([BOK:108],[TOR:113],[TSP:188],[ORI:136],[ONS:212],[DGM:34],[STH:93],[MIR:183],[JOU:93])([M12:160],[M11:160],[5ED:246])([BOK:120],[ALA:119])([8ED:204],[M12:153],[M10:163],[ONS:213])([SCG:85])
+LAYOUT SIDEBOARD:(1,1)(COLOR_IDENTITY,true,5)|([TSP:171])
diff --git a/Mage.Tests/CommanderAnafenza_WBG.dck b/Mage.Tests/CommanderAnafenza_WBG.dck
index 0c8db1eb73..04860ce9af 100644
--- a/Mage.Tests/CommanderAnafenza_WBG.dck
+++ b/Mage.Tests/CommanderAnafenza_WBG.dck
@@ -1,88 +1,90 @@
-1 [RTR:71] Necropolis Regent
-1 [FUT:171] Llanowar Reborn
-1 [RAV:158] Doubling Season
-1 [RAV:33] Twilight Drover
-1 [RAV:278] Golgari Rot Farm
-1 [8ED:247] Fecundity
-1 [M11:221] Whispersilk Cloak
-1 [6ED:274] Ashnod's Altar
-1 [ZEN:182] Scute Mob
-1 [RTR:152] Corpsejack Menace
-1 [ALA:140] Mycoloth
-1 [RTR:150] Collective Blessing
-1 [RTR:194] Selesnya Charm
-1 [M13:170] Farseek
-1 [BNG:148] Karametra, God of Harvests
-7 [BFZ:270] Forest
-1 [FUT:138] Sprout Swarm
-1 [DKA:76] Tragic Slip
-1 [DGM:149] Golgari Guildgate
-1 [GTC:123] Gyre Sage
-1 [DGM:93] Putrefy
-1 [GTC:242] Godless Shrine
-1 [AVR:10] Cathars' Crusade
-1 [AVR:171] Champion of Lambholt
-1 [M14:1] Ajani, Caller of the Pride
-1 [THS:153] Bow of Nylea
-1 [INV:233] Aura Shards
-1 [RTR:63] Desecration Demon
-1 [MOR:72] Oona's Blackguard
-1 [KTK:215] Abzan Banner
-1 [KTK:79] Mer-Ek Nightblade
-1 [KTK:179] Ivorytusk Fortress
-1 [M15:177] Hornet Nest
-1 [DGM:153] Orzhov Guildgate
-1 [KTK:133] Hardened Scales
-1 [KTK:210] Utter End
-1 [DGM:155] Selesnya Guildgate
-1 [RTR:176] Korozda Guildmage
-1 [VMA:255] Magister of Worth
-1 [ISD:199] Parallel Lives
-4 [BFZ:260] Swamp
-1 [M12:190] Rampant Growth
-1 [KTK:85] Retribution of the Ancients
-1 [DGM:63] Deadbridge Chant
-1 [CHK:239] Sakura-Tribe Elder
-1 [ISD:239] Gavony Township
-1 [DGM:114] Voice of Resurgence
-1 [VMA:250] Deathreap Ritual
-1 [CHK:225] Kodama's Reach
-1 [M13:229] Sunpetal Grove
-1 [M13:227] Reliquary Tower
-1 [SCG:25] Wing Shards
-1 [KTK:1] Abzan Battle Priest
-1 [M11:120] Viscera Seer
-1 [THS:227] Temple of Silence
-1 [RTR:174] Jarad, Golgari Lich Lord
-1 [RAV:251] Privileged Position
-1 [KTK:3] Ainok Bond-Kin
-1 [NPH:73] Sheoldred, Whispering One
-1 [KTK:2] Abzan Falconer
-1 [GTC:182] Obzedat, Ghost Council
-1 [KTK:241] Sandsteppe Citadel
-1 [RTR:121] Death's Presence
-4 [BFZ:250] Plains
-1 [KTK:161] Abzan Charm
-1 [ISD:242] Isolated Chapel
-1 [RTR:248] Temple Garden
-1 [KTK:160] Abzan Ascendancy
-1 [JOU:65] Dictate of Erebos
-1 [TMP:36] Living Death
-1 [M11:11] Condemn
-1 [ORI:246] Evolving Wilds
-1 [RAV:218] Phytohydra
-1 [ISD:249] Woodland Cemetery
-1 [M15:93] Cruel Sadist
-1 [CSP:130] Juniper Order Ranger
-1 [WWK:132] Bojuka Bog
-1 [FUT:169] Dakmor Salvage
-1 [CMD:200] Ghave, Guru of Spores
-1 [DIS:95] Sprouting Phytohydra
-1 [RAV:281] Selesnya Sanctuary
-1 [KTK:156] Tuskguard Captain
-1 [DKA:156] Grim Backwoods
-1 [GPT:122] Mortify
-1 [GPT:161] Orzhov Basilica
-1 [C13:281] Command Tower
-1 [RAV:207] Glare of Subdual
-SB: 1 [KTK:163] Anafenza, the Foremost
+1 [RTR:71] Necropolis Regent
+1 [FUT:171] Llanowar Reborn
+1 [RAV:158] Doubling Season
+1 [RAV:33] Twilight Drover
+1 [RAV:278] Golgari Rot Farm
+1 [8ED:247] Fecundity
+1 [M11:221] Whispersilk Cloak
+1 [6ED:274] Ashnod's Altar
+1 [ZEN:182] Scute Mob
+1 [RTR:152] Corpsejack Menace
+1 [ALA:140] Mycoloth
+1 [RTR:150] Collective Blessing
+1 [RTR:194] Selesnya Charm
+4 [BFZ:250a] Plains
+1 [M13:170] Farseek
+1 [BNG:148] Karametra, God of Harvests
+7 [BFZ:270a] Forest
+1 [FUT:138] Sprout Swarm
+1 [DKA:76] Tragic Slip
+1 [DGM:149] Golgari Guildgate
+1 [GTC:123] Gyre Sage
+1 [DGM:93] Putrefy
+1 [GTC:242] Godless Shrine
+1 [AVR:10] Cathars' Crusade
+1 [TMP:142] Living Death
+1 [AVR:171] Champion of Lambholt
+1 [M14:1] Ajani, Caller of the Pride
+1 [THS:153] Bow of Nylea
+1 [INV:233] Aura Shards
+1 [RTR:63] Desecration Demon
+1 [MOR:72] Oona's Blackguard
+1 [KTK:215] Abzan Banner
+1 [KTK:79] Mer-Ek Nightblade
+1 [KTK:179] Ivorytusk Fortress
+1 [M15:177] Hornet Nest
+1 [DGM:153] Orzhov Guildgate
+1 [KTK:133] Hardened Scales
+1 [KTK:210] Utter End
+1 [DGM:155] Selesnya Guildgate
+1 [RTR:176] Korozda Guildmage
+1 [VMA:255] Magister of Worth
+1 [ISD:199] Parallel Lives
+1 [M12:190] Rampant Growth
+1 [KTK:85] Retribution of the Ancients
+1 [DGM:63] Deadbridge Chant
+1 [CHK:239] Sakura-Tribe Elder
+1 [ISD:239] Gavony Township
+1 [DGM:114] Voice of Resurgence
+1 [VMA:250] Deathreap Ritual
+1 [CHK:225] Kodama's Reach
+1 [M13:229] Sunpetal Grove
+1 [M13:227] Reliquary Tower
+1 [SCG:25] Wing Shards
+1 [KTK:1] Abzan Battle Priest
+1 [M11:120] Viscera Seer
+1 [THS:227] Temple of Silence
+1 [RTR:174] Jarad, Golgari Lich Lord
+1 [RAV:251] Privileged Position
+4 [BFZ:260a] Swamp
+1 [KTK:3] Ainok Bond-Kin
+1 [NPH:73] Sheoldred, Whispering One
+1 [KTK:2] Abzan Falconer
+1 [GTC:182] Obzedat, Ghost Council
+1 [KTK:241] Sandsteppe Citadel
+1 [RTR:121] Death's Presence
+1 [KTK:161] Abzan Charm
+1 [ISD:242] Isolated Chapel
+1 [RTR:248] Temple Garden
+1 [KTK:160] Abzan Ascendancy
+1 [JOU:65] Dictate of Erebos
+1 [M11:11] Condemn
+1 [ORI:246] Evolving Wilds
+1 [RAV:218] Phytohydra
+1 [ISD:249] Woodland Cemetery
+1 [M15:93] Cruel Sadist
+1 [CSP:130] Juniper Order Ranger
+1 [WWK:132] Bojuka Bog
+1 [FUT:169] Dakmor Salvage
+1 [CMD:200] Ghave, Guru of Spores
+1 [DIS:95] Sprouting Phytohydra
+1 [RAV:281] Selesnya Sanctuary
+1 [KTK:156] Tuskguard Captain
+1 [DKA:156] Grim Backwoods
+1 [GPT:122] Mortify
+1 [GPT:161] Orzhov Basilica
+1 [C13:281] Command Tower
+1 [RAV:207] Glare of Subdual
+SB: 1 [KTK:163] Anafenza, the Foremost
+LAYOUT MAIN:(2,8)(CMC,true,5)|()([ZEN:182],[M11:120],[M15:93])([GTC:123],[MOR:72],[RTR:176],[CHK:239],[DGM:114],[KTK:3])([RAV:33],[AVR:171],[M15:177],[KTK:2],[KTK:156])([RTR:152],[RTR:63],[KTK:79],[KTK:1],[RTR:174])([ALA:140],[BNG:148],[KTK:179],[GTC:182],[RAV:218],[CSP:130],[CMD:200],[DIS:95])([RTR:71],[VMA:255])([NPH:73])([FUT:171],[RAV:278],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[DGM:149],[GTC:242],[DGM:153],[DGM:155],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[ISD:239],[M13:229],[M13:227],[THS:227],[KTK:241],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[ISD:242],[RTR:248],[ORI:246],[ISD:249],[WWK:132],[FUT:169],[RAV:281],[DKA:156],[GPT:161],[C13:281])([DKA:76],[KTK:133],[KTK:85],[M11:11])([RTR:194],[M13:170],[FUT:138],[M12:190])([8ED:247],[M11:221],[6ED:274],[DGM:93],[M14:1],[THS:153],[INV:233],[KTK:215],[CHK:225],[SCG:25],[KTK:161],[KTK:160],[GPT:122])([KTK:210],[ISD:199],[VMA:250],[RAV:207])([RAV:158],[AVR:10],[RAV:251],[JOU:65],[TMP:142])([RTR:150],[DGM:63],[RTR:121])()
+LAYOUT SIDEBOARD:(1,1)(COLOR_IDENTITY,true,5)|([KTK:163])
diff --git a/Mage.Tests/CommanderDuel_Karador_BGW.dck b/Mage.Tests/CommanderDuel_Karador_BGW.dck
index e0ea3d96a1..946df2e3d0 100644
--- a/Mage.Tests/CommanderDuel_Karador_BGW.dck
+++ b/Mage.Tests/CommanderDuel_Karador_BGW.dck
@@ -1,100 +1,102 @@
-1 [M15:108] Necromancer's Stockpile
-1 [FRF:76] Merciless Executioner
-1 [9ED:283] Wood Elves
-1 [M11:172] Fauna Shaman
-1 [CMD:140] Acidic Slime
-1 [PLS:42] Diabolic Intent
-1 [AVR:226] Cavern of Souls
-1 [TOR:77] Putrid Imp
-1 [M15:194] Reclamation Sage
-1 [RAV:230] Shambling Shell
-1 [ISD:105] Liliana of the Veil
-1 [M15:198] Satyr Wayfinder
-1 [UDS:115] Pattern of Rebirth
-1 [JOU:163] Mana Confluence
-1 [ARB:75] Qasali Pridemage
-1 [BFZ:250] Plains
-1 [ZEN:172] Oracle of Mul Daya
-1 [M13:229] Sunpetal Grove
-1 [WWK:20] Stoneforge Mystic
-1 [8ED:322] City of Brass
-1 [ZEN:83] Bloodghast
-1 [TSP:104] Dread Return
-1 [ICE:278] Swords to Plowshares
-1 [USG:230] Acridian
-1 [RAV:107] Stinkweed Imp
-1 [CON:113] Knight of the Reliquary
-1 [AVR:106] Griselbrand
-1 [10E:137] Doomed Necromancer
-1 [M12:39] Sun Titan
-1 [NPH:104] Birthing Pod
-1 [M12:165] Birds of Paradise
-1 [ORI:245] Caves of Koilos
-1 [ZEN:211] Arid Mesa
-1 [SOM:72] Necrotic Ooze
-1 [M13:83] Bloodthrone Vampire
-1 [ZEN:219] Marsh Flats
-1 [TMP:340] Wasteland
-1 [RAV:81] Dark Confidant
-1 [TOR:69] Mesmeric Fiend
-1 [RAV:87] Golgari Thug
-1 [ISD:15] Fiend Hunter
-1 [M15:248] Urborg, Tomb of Yawgmoth
-1 [ORI:248] Llanowar Wastes
-1 [KTK:248] Windswept Heath
-1 [KTK:249] Wooded Foothills
-1 [WWK:132] Bojuka Bog
-1 [ALL:167] Phyrexian Devourer
-1 [EVE:180] Twilight Mire
-1 [5DN:86] Eternal Witness
-1 [ZEN:220] Misty Rainforest
-1 [MOR:22] Reveillark
-1 [RAV:167] Golgari Grave-Troll
-1 [ZEN:229] Verdant Catacombs
-1 [KTK:239] Polluted Delta
-1 [10E:349] Brushland
-1 [RTR:243] Overgrown Tomb
-1 [WWK:144] Stirring Wildwood
-1 [C15:281] Command Tower
-1 [SCG:59] Carrion Feeder
-1 [ISD:249] Woodland Cemetery
-1 [RTR:248] Temple Garden
-1 [KTK:233] Flooded Strand
-1 [ROE:33] Linvala, Keeper of Silence
-1 [NPH:9] Elesh Norn, Grand Cenobite
-1 [ISD:242] Isolated Chapel
-1 [FUT:169] Dakmor Salvage
-1 [M15:5] Boonweaver Giant
-1 [LRW:248] Gaddock Teeg
-1 [KTK:230] Bloodstained Mire
-1 [RAV:172] Life from the Loam
-1 [M12:188] Primeval Titan
-1 [CHK:239] Sakura-Tribe Elder
-1 [USG:321] Gaea's Cradle
-1 [RTR:213] Deathrite Shaman
-1 [USG:322] Phyrexian Tower
-1 [BFZ:270] Forest
-1 [FUT:174] Dryad Arbor
-1 [3ED:297] Savannah
-1 [ULG:11] Karmic Guide
-1 [3ED:298] Scrubland
-1 [UDS:1] Academy Rector
-1 [5ED:191] Sylvan Library
-1 [M11:218] Triskelion
-1 [9ED:54] Weathered Wayfarer
-1 [5ED:2] Animate Dead
-1 [3ED:13] Demonic Tutor
-1 [ARN:84] Bazaar of Baghdad
-1 [ISD:122] Unburial Rites
-1 [GTC:242] Godless Shrine
-1 [ME3:69] Grim Tutor
-1 [SHM:110] Devoted Druid
-1 [EXO:129] Survival of the Fittest
-1 [BFZ:260] Swamp
-1 [DST:140] Skullclamp
-1 [ALA:202] Tidehollow Sculler
-1 [3ED:283] Bayou
-1 [10E:361] Treetop Village
-1 [TSP:245] Saffi Eriksdotter
-1 [M11:120] Viscera Seer
-SB: 1 [CMD:207] Karador, Ghost Chieftain
+1 [RAV:230] Shambling Shell
+1 [UDS:115] Pattern of Rebirth
+1 [5ED:140] Animate Dead
+1 [8ED:322] City of Brass
+1 [M15:5] Boonweaver Giant
+1 [EXO:129] Survival of the Fittest
+1 [ZEN:220] Misty Rainforest
+1 [10E:361] Treetop Village
+1 [M15:194] Reclamation Sage
+1 [FUT:174] Dryad Arbor
+1 [M15:198] Satyr Wayfinder
+1 [ZEN:229] Verdant Catacombs
+1 [USG:322] Phyrexian Tower
+1 [BFZ:270a] Forest
+1 [NPH:9] Elesh Norn, Grand Cenobite
+1 [USG:321] Gaea's Cradle
+1 [M15:108] Necromancer's Stockpile
+1 [WWK:20] Stoneforge Mystic
+1 [PLS:42] Diabolic Intent
+1 [ISD:105] Liliana of the Veil
+1 [9ED:283] Wood Elves
+1 [UDS:1] Academy Rector
+1 [M12:188] Primeval Titan
+1 [ALL:125] Phyrexian Devourer
+1 [EVE:180] Twilight Mire
+1 [RTR:213] Deathrite Shaman
+1 [RAV:107] Stinkweed Imp
+1 [JOU:163] Mana Confluence
+1 [M13:83] Bloodthrone Vampire
+1 [M12:39] Sun Titan
+1 [WWK:144] Stirring Wildwood
+1 [M13:229] Sunpetal Grove
+1 [ALA:202] Tidehollow Sculler
+1 [KTK:248] Windswept Heath
+1 [KTK:249] Wooded Foothills
+1 [10E:349] Brushland
+1 [M11:172] Fauna Shaman
+1 [MOR:22] Reveillark
+1 [RTR:243] Overgrown Tomb
+1 [M15:248] Urborg, Tomb of Yawgmoth
+1 [RTR:248] Temple Garden
+1 [3ED:105] Demonic Tutor
+1 [FRF:76] Merciless Executioner
+1 [LRW:248] Gaddock Teeg
+1 [ULG:11] Karmic Guide
+1 [WWK:132] Bojuka Bog
+1 [KTK:239] Polluted Delta
+1 [FUT:169] Dakmor Salvage
+1 [SCG:59] Carrion Feeder
+1 [DST:140] Skullclamp
+1 [ARN:70] Bazaar of Baghdad
+1 [ICE:54] Swords to Plowshares
+1 [KTK:233] Flooded Strand
+1 [KTK:230] Bloodstained Mire
+1 [9ED:54] Weathered Wayfarer
+1 [ARB:75] Qasali Pridemage
+1 [C15:281] Command Tower
+1 [BFZ:250a] Plains
+1 [TOR:77] Putrid Imp
+1 [GTC:242] Godless Shrine
+1 [ROE:33] Linvala, Keeper of Silence
+1 [CMD:140] Acidic Slime
+1 [M11:218] Triskelion
+1 [CON:113] Knight of the Reliquary
+1 [3ED:283] Bayou
+1 [TSP:104] Dread Return
+1 [ZEN:83] Bloodghast
+1 [3ED:286] Scrubland
+1 [3ED:285] Savannah
+1 [5DN:86] Eternal Witness
+1 [USG:230] Acridian
+1 [SOM:72] Necrotic Ooze
+1 [CHK:239] Sakura-Tribe Elder
+1 [TMP:330] Wasteland
+1 [ME3:69] Grim Tutor
+1 [ORI:248] Llanowar Wastes
+1 [SHM:110] Devoted Druid
+1 [RAV:172] Life from the Loam
+1 [M11:120] Viscera Seer
+1 [NPH:104] Birthing Pod
+1 [BFZ:260a] Swamp
+1 [ISD:122] Unburial Rites
+1 [AVR:226] Cavern of Souls
+1 [ISD:15] Fiend Hunter
+1 [ISD:242] Isolated Chapel
+1 [AVR:106] Griselbrand
+1 [ORI:245] Caves of Koilos
+1 [ISD:249] Woodland Cemetery
+1 [RAV:81] Dark Confidant
+1 [RAV:167] Golgari Grave-Troll
+1 [RAV:87] Golgari Thug
+1 [ZEN:211] Arid Mesa
+1 [ZEN:172] Oracle of Mul Daya
+1 [M12:165] Birds of Paradise
+1 [10E:137] Doomed Necromancer
+1 [TSP:245] Saffi Eriksdotter
+1 [ZEN:219] Marsh Flats
+1 [5ED:329] Sylvan Library
+1 [TOR:69] Mesmeric Fiend
+SB: 1 [CMD:207] Karador, Ghost Chieftain
+LAYOUT MAIN:(2,9)(CMC,true,5)|([FUT:174])([TOR:77],[M12:165],[SCG:59],[RTR:213],[9ED:54],[M11:120])([M11:172],[M15:198],[ARB:75],[WWK:20],[ZEN:83],[USG:230],[M13:83],[RAV:81],[TOR:69],[RAV:87],[LRW:248],[CHK:239],[SHM:110],[ALA:202],[TSP:245])([FRF:76],[9ED:283],[M15:194],[RAV:230],[RAV:107],[CON:113],[10E:137],[ISD:15],[5DN:86])([ZEN:172],[SOM:72],[ROE:33],[UDS:1])([CMD:140],[MOR:22],[RAV:167],[ULG:11])([M12:39],[ALL:125],[M12:188],[M11:218])([NPH:9],[M15:5])([AVR:106])([AVR:226],[JOU:163],[BFZ:250a],[M13:229],[8ED:322],[ORI:245],[ZEN:211],[ZEN:219],[TMP:330],[M15:248],[ORI:248],[KTK:248],[KTK:249],[WWK:132],[EVE:180],[ZEN:220],[ZEN:229],[KTK:239],[10E:349],[RTR:243],[WWK:144],[C15:281],[ISD:249],[RTR:248],[KTK:233],[ISD:242],[FUT:169],[KTK:230],[USG:321],[USG:322],[BFZ:270a],[3ED:285],[3ED:286],[ARN:70],[GTC:242],[BFZ:260a],[3ED:283],[10E:361])([ICE:54],[DST:140])([M15:108],[PLS:42],[RAV:172],[5ED:329],[5ED:140],[3ED:105],[EXO:129])([ISD:105],[ME3:69])([UDS:115],[TSP:104],[NPH:104])([ISD:122])()()()
+LAYOUT SIDEBOARD:(1,1)(COLOR_IDENTITY,true,5)|([CMD:207])
diff --git a/Mage.Tests/RB Aggro.dck b/Mage.Tests/RB Aggro.dck
index fc6cc06bba..649d436fe1 100644
--- a/Mage.Tests/RB Aggro.dck	
+++ b/Mage.Tests/RB Aggro.dck	
@@ -1,72 +1,71 @@
 NAME:RB Aggro
-1 [GUR:3] Mountain
-1 [SHM:296] Mountain
-1 [AVR:240] Mountain
-1 [SHM:295] Mountain
-1 [SHM:294] Mountain
-1 [TSP:295] Mountain
-1 [TSP:294] Mountain
-1 [10E:379] Mountain
-1 [SOM:245] Mountain
-1 [ZEN:262] Mountain
-1 [ZEN:245] Mountain
-1 [10E:378] Mountain
-1 [SOM:244] Mountain
-1 [SOM:243] Mountain
-1 [ZEN:244] Mountain
 1 [SOM:242] Mountain
-1 [ZEN:243] Mountain
-1 [ZEN:242] Mountain
-1 [ALA:243] Mountain
-1 [ALA:242] Mountain
-1 [M12:245] Mountain
-1 [CHK:299] Mountain
-1 [M12:243] Mountain
-1 [M12:244] Mountain
-1 [CHK:300] Mountain
-1 [CHK:301] Mountain
-1 [M12:242] Mountain
-1 [CHK:302] Mountain
-1 [10E:376] Mountain
-1 [M11:243] Mountain
-1 [M11:242] Mountain
-1 [M11:245] Mountain
-1 [M11:244] Mountain
-1 [MBS:152] Mountain
-1 [ALA:244] Mountain
-1 [ALA:245] Mountain
+1 [INV:344] Mountain
+1 [INV:345] Mountain
 1 [ZEN:263] Mountain
+1 [SHM:294] Mountain
 1 [ZEN:264] Mountain
-1 [RAV:301] Mountain
-1 [RAV:300] Mountain
-1 [RAV:299] Mountain
-1 [USG:345] Mountain
-1 [USG:346] Mountain
-1 [M10:242] Mountain
-1 [RAV:302] Mountain
-1 [USG:343] Mountain
-1 [USG:344] Mountain
-1 [ISD:259] Mountain
-1 [ROE:244] Mountain
+1 [SHM:295] Mountain
+1 [SHM:296] Mountain
+1 [ZEN:262] Mountain
 1 [ISD:261] Mountain
 1 [ISD:260] Mountain
+1 [AVR:240] Mountain
+4 [TMP:343] Mountain
+1 [RAV:301] Mountain
+1 [RAV:300] Mountain
+1 [RAV:302] Mountain
+1 [M10:244] Mountain
+1 [M10:245] Mountain
+1 [M10:242] Mountain
+1 [M10:243] Mountain
+1 [GUR:3] Mountain
+1 [MRD:299] Mountain
+1 [SOM:245] Mountain
+1 [SOM:244] Mountain
+1 [SOM:243] Mountain
+1 [CHK:301] Mountain
+1 [LRW:294] Mountain
+1 [CHK:302] Mountain
+1 [LRW:295] Mountain
+1 [ALA:242] Mountain
+1 [RAV:299] Mountain
+1 [LRW:296] Mountain
+1 [ALA:243] Mountain
+1 [CHK:300] Mountain
+1 [LRW:297] Mountain
+1 [ALA:244] Mountain
+1 [ALA:245] Mountain
+1 [M11:245] Mountain
+1 [ZEN:242] Mountain
+1 [ZEN:243] Mountain
+1 [M11:243] Mountain
+1 [ZEN:244] Mountain
+1 [M11:244] Mountain
+1 [M11:242] Mountain
+1 [USG:346] Mountain
+1 [ZEN:245] Mountain
+1 [USG:344] Mountain
+1 [USG:345] Mountain
+1 [USG:343] Mountain
+1 [MRD:300] Mountain
+1 [MBS:152] Mountain
+1 [MRD:301] Mountain
+1 [MRD:302] Mountain
 1 [ROE:241] Mountain
+1 [CHK:299] Mountain
+1 [M12:245] Mountain
+1 [M12:244] Mountain
+1 [10E:378] Mountain
+1 [M12:243] Mountain
+1 [ROE:244] Mountain
+1 [10E:379] Mountain
+1 [M12:242] Mountain
+1 [10E:376] Mountain
 1 [ROE:242] Mountain
 1 [ROE:243] Mountain
-1 [MRD:301] Mountain
-1 [MRD:300] Mountain
-1 [MRD:299] Mountain
-1 [M10:244] Mountain
-1 [M10:243] Mountain
-1 [M10:245] Mountain
-1 [LRW:294] Mountain
-1 [TMP:319] Mountain
-1 [LRW:295] Mountain
-1 [LRW:296] Mountain
-1 [LRW:297] Mountain
-1 [TMP:322] Mountain
-1 [MRD:302] Mountain
-1 [TMP:320] Mountain
-1 [TMP:321] Mountain
-1 [INV:345] Mountain
-1 [INV:344] Mountain
+1 [TSP:295] Mountain
+1 [TSP:294] Mountain
+1 [ISD:259] Mountain
+LAYOUT MAIN:(2,1)(CMC,true,5)|()([GUR:3],[SHM:296],[AVR:240],[SHM:295],[SHM:294],[TSP:295],[TSP:294],[10E:379],[SOM:245],[ZEN:262],[ZEN:245],[10E:378],[SOM:244],[SOM:243],[ZEN:244],[SOM:242],[ZEN:243],[ZEN:242],[ALA:243],[ALA:242],[M12:245],[CHK:299],[M12:243],[M12:244],[CHK:300],[CHK:301],[M12:242],[CHK:302],[10E:376],[M11:243],[M11:242],[M11:245],[M11:244],[MBS:152],[ALA:244],[ALA:245],[ZEN:263],[ZEN:264],[RAV:301],[RAV:300],[RAV:299],[USG:345],[USG:346],[M10:242],[RAV:302],[USG:343],[USG:344],[ISD:259],[ROE:244],[ISD:261],[ISD:260],[ROE:241],[ROE:242],[ROE:243],[MRD:301],[MRD:300],[MRD:299],[M10:244],[M10:243],[M10:245],[LRW:294],[TMP:343],[LRW:295],[LRW:296],[LRW:297],[TMP:343],[MRD:302],[TMP:343],[TMP:343],[INV:345],[INV:344])
+LAYOUT SIDEBOARD:(0,0)(COLOR_IDENTITY,true,5)|