diff --git a/3D-Kirbys-Adventure/game.dat b/3D-Kirbys-Adventure/game.dat
index e105c50..dec55d9 100644
--- a/3D-Kirbys-Adventure/game.dat
+++ b/3D-Kirbys-Adventure/game.dat
@@ -1,11 +1,7 @@
 title = "3D Classics: Kirby's Adventure"
 description = "Kirby's Adventure is a 1993 action-platform video game developed by HAL Laboratory and published by Nintendo for the Nintendo Entertainment System video game console. A 3D Classics version was released for the Nintendo 3DS eShop in November 2011."
-compatibility = 1
-tested_date = "2017-06-05"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = true
-tested_by = "Clector"
 
 [[ releases ]]
 title = "0004000000054600"
@@ -21,3 +17,11 @@ release_date = "2011-11-17"
 title = "000400000004e800"
 region = "JPN"
 release_date = "2012-04-25"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-05"
+version = "HEAD-8f0a23b"
+author = "Clector"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Animal-Crossing-New-Leaf/game.dat b/Animal-Crossing-New-Leaf/game.dat
index 05744eb..01ed904 100644
--- a/Animal-Crossing-New-Leaf/game.dat
+++ b/Animal-Crossing-New-Leaf/game.dat
@@ -1,13 +1,17 @@
 title = "Animal Crossing: New Leaf"
 description = "Animal Crossing: New Leaf is a life simulation video game developed and published by Nintendo for the Nintendo 3DS console. In the game, the player character takes on the role of mayor in a town populated with anthropomorphic animals."
-compatibility = 3
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = true
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000086300"
 region = "USA"
 release_date = "2013-06-09"
+
+[[ testcases ]]
+compatibility = 3
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Fire-Emblem-Awakening/game.dat b/Fire-Emblem-Awakening/game.dat
index c817875..a456a01 100644
--- a/Fire-Emblem-Awakening/game.dat
+++ b/Fire-Emblem-Awakening/game.dat
@@ -1,13 +1,17 @@
 title = "Fire Emblem Awakening"
 description = "Fire Emblem Awakening is a tactical role-playing video game, developed by Intelligent Systems and Nintendo SPD and published by Nintendo for the Nintendo 3DS handheld video game console in April 2012 in Japan, and April 2013 outside Japan. It is the eleventh entry in the Fire Emblem series, and the first to be developed for the Nintendo 3DS."
-compatibility = 2
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = true
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "00040000000A0500"
 region = "USA"
 release_date = "2013-02-04"
+
+[[ testcases ]]
+compatibility = 2
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Kirby-Triple-Deluxe/game.dat b/Kirby-Triple-Deluxe/game.dat
index 7c8ec89..93876f8 100644
--- a/Kirby-Triple-Deluxe/game.dat
+++ b/Kirby-Triple-Deluxe/game.dat
@@ -1,11 +1,7 @@
 title = "Kirby: Triple Deluxe"
 description = "Kirby: Triple Deluxe is the thirteenth platform installment of the Kirby video game series, developed by HAL Laboratory and published by Nintendo for the Nintendo 3DS."
-compatibility = 1
-tested_date = "2017-06-05"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = true
 needs_shared_font = true
-tested_by = "Clector"
 
 [[ releases ]]
 title = "000400000010BE00"
@@ -21,3 +17,11 @@ release_date = "2014-05-02"
 title = "000400000010C000"
 region = "EUR"
 release_date = "2014-05-16"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-05"
+version = "HEAD-8f0a23b"
+author = "Clector"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Legend-of-Zelda-A-Link-Between-Worlds/game.dat b/Legend-of-Zelda-A-Link-Between-Worlds/game.dat
index f8750cc..21c5067 100644
--- a/Legend-of-Zelda-A-Link-Between-Worlds/game.dat
+++ b/Legend-of-Zelda-A-Link-Between-Worlds/game.dat
@@ -1,13 +1,17 @@
 title = "The Legend of Zelda: A Link Between Worlds"
 description = "The Legend of Zelda: A Link Between Worlds is an action-adventure game developed and published by Nintendo for the Nintendo 3DS handheld game console. It is the seventeenth installment in The Legend of Zelda series and a successor to the 1991 Super Nintendo Entertainment System title The Legend of Zelda: A Link to the Past."
-compatibility = 1
-tested_date = "2017-06-03"
-tested_version = "HEAD-e46ec64"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "Leo121"
 
 [[ releases ]]
 title = "00040000000EC300"
 region = "USA"
 release_date = "2013-11-22"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-03"
+version = "HEAD-e46ec64"
+author = "Leo121"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Legend-of-Zelda-Majoras-Mask/game.dat b/Legend-of-Zelda-Majoras-Mask/game.dat
index 1491c2d..ebc3121 100644
--- a/Legend-of-Zelda-Majoras-Mask/game.dat
+++ b/Legend-of-Zelda-Majoras-Mask/game.dat
@@ -1,11 +1,7 @@
 title = "The Legend of Zelda: Majora's Mask 3D"
 description = "The Legend of Zelda: Majora's Mask 3D is an action-adventure video game co-developed by Grezzo and Nintendo for the Nintendo 3DS handheld game console. The game is an enhanced remake of The Legend of Zelda: Majora's Mask, which was originally released for the Nintendo 64 home console in 2000. The game was released worldwide in February 2015"
-compatibility = 1
-tested_date = "2017-06-03"
-tested_version = "HEAD-a7ddec8"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000125500"
@@ -16,3 +12,11 @@ release_date = "2015-02-13"
 title = "0004000000125600"
 region = "EUR"
 release_date = "2015-02-13"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-03"
+version = "HEAD-a7ddec8"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Legend-of-Zelda-Ocarina-of-Time/game.dat b/Legend-of-Zelda-Ocarina-of-Time/game.dat
index c876254..670ca25 100644
--- a/Legend-of-Zelda-Ocarina-of-Time/game.dat
+++ b/Legend-of-Zelda-Ocarina-of-Time/game.dat
@@ -1,13 +1,17 @@
 title = "The Legend of Zelda: Ocarina of Time 3D"
 description = "The Legend of Zelda: Ocarina of Time 3D is an action-adventure video game co-developed by Grezzo and Nintendo EAD Tokyo and published by Nintendo for the Nintendo 3DS handheld game console. The game was released worldwide in June 2011."
-compatibility = 0
-tested_date = "2017-06-03"
-tested_version = "HEAD-a7ddec8"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000033500"
 region = "USA"
 release_date = "2011-06-19"
+
+[[ testcases ]]
+compatibility = 0
+date = "2017-06-03"
+version = "HEAD-a7ddec8"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Mario-Kart-7/game.dat b/Mario-Kart-7/game.dat
index b61d95c..95b9a36 100644
--- a/Mario-Kart-7/game.dat
+++ b/Mario-Kart-7/game.dat
@@ -1,13 +1,17 @@
 title = "Mario Kart 7"
 description = "Mario Kart 7 is a 2011 racing video game. It is the seventh major installment in the Mario Kart series and the third to be released for handheld consoles."
-compatibility = 3
-tested_date = "2017-06-03"
-tested_version = "HEAD-a7ddec8"
 needs_system_files = true
 needs_shared_font = false
-tested_by = "TheKoopaKingdom"
 
 [[ releases ]]
 title = "0004000000030800"
 region = "USA"
 release_date = "2011-12-04"
+
+[[ testcases ]]
+compatibility = 3
+date = "2017-06-03"
+version = "HEAD-a7ddec8"
+author = "TheKoopaKingdom"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Mario-Sports-Superstars/game.dat b/Mario-Sports-Superstars/game.dat
index ed5908c..028b7b3 100644
--- a/Mario-Sports-Superstars/game.dat
+++ b/Mario-Sports-Superstars/game.dat
@@ -1,11 +1,15 @@
 title = "Mario Sports Superstars"
 description = "Mario Sports Superstars is a sports video game developed by Bandai Namco Studios and Camelot Software Planning and published by Nintendo for the Nintendo 3DS handheld video game console. The game contains five sports minigames, soccer, baseball, tennis, golf, and horse racing, and was released worldwide in March 2017."
-compatibility = 5
-tested_date = "2017-06-03"
-tested_version = "HEAD-a7ddec8"
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000188C00"
 region = "USA"
 release_date = "2017-03-06"
+
+[[ testcases ]]
+compatibility = 5
+date = "2017-06-03"
+version = "HEAD-a7ddec8"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Monster-Hunter-4-Ultimate/game.dat b/Monster-Hunter-4-Ultimate/game.dat
index 845ec58..e5e784f 100644
--- a/Monster-Hunter-4-Ultimate/game.dat
+++ b/Monster-Hunter-4-Ultimate/game.dat
@@ -1,13 +1,17 @@
 title = "Monster Hunter 4 Ultimate"
 description = "Monster Hunter 4 is an action role-playing video game developed and published by Capcom. It is the second game in the Monster Hunter series to be released on the Nintendo 3DS. Originally released in Japan on September 14, 2013. On January 26, 2014, an enhanced edition titled Monster Hunter 4G was announced for release in Japan on October 11, 2014, and allowed players to utilize Monster Hunter 4 save files. This version was released in North America and Europe as Monster Hunter 4 Ultimate on February 13, 2015. The new version of the game was released alongside New Nintendo 3DS in all regions except Australia, and in addition to the separate game release, it is available bundled with a 3DS XL variant of the newer console model."
-compatibility = 3
-tested_date = "2017-06-05"
-tested_version = "HEAD-bae3799"
 needs_system_files = true
 needs_shared_font = true
-tested_by = "Desmond"
 
 [[ releases ]]
 title = "0004000000126300"
 region = "USA"
 release_date = "2015-02-13"
+
+[[ testcases ]]
+compatibility = 3
+date = "2017-06-05"
+version = "HEAD-bae3799"
+author = "Desmond"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Pokemon-Mystery-Dungeon-Gates-To-Infinity/game.dat b/Pokemon-Mystery-Dungeon-Gates-To-Infinity/game.dat
index cd577b7..425371d 100644
--- a/Pokemon-Mystery-Dungeon-Gates-To-Infinity/game.dat
+++ b/Pokemon-Mystery-Dungeon-Gates-To-Infinity/game.dat
@@ -1,11 +1,7 @@
 title = "Pokémon Mystery Dungeon: Gates to Infinity"
 description = "Pokémon Mystery Dungeon: Gates to Infinity is a role-playing game in the Pokémon franchise developed by Spike Chunsoft and published by Nintendo for the Nintendo 3DS. It is the ninth installment in the Pokémon Mystery Dungeon series."
-compatibility = 1
-tested_date = "2017-06-05"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "jselby"
 
 [[ releases ]]
 title = "00040000000ba800"
@@ -16,3 +12,11 @@ release_date = "2013-03-24"
 title = "00040000000ba900"
 region = "EUR"
 release_date = "2013-05-17"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-05"
+version = "HEAD-8f0a23b"
+author = "jselby"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Pokemon-Omega-Ruby-Alpha-Sapphire/game.dat b/Pokemon-Omega-Ruby-Alpha-Sapphire/game.dat
index 942af9f..64650ff 100644
--- a/Pokemon-Omega-Ruby-Alpha-Sapphire/game.dat
+++ b/Pokemon-Omega-Ruby-Alpha-Sapphire/game.dat
@@ -1,11 +1,7 @@
 title = "Pokémon Omega Ruby and Alpha Sapphire"
 description = "Pokémon Omega Ruby and Alpha Sapphire are two 2014 role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS family of systems. They are part of the sixth generation of the Pokémon series, serving as enhanced remakes of the 2002 Game Boy Advance titles Pokémon Ruby and Sapphire."
-compatibility = 1
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = true
 needs_shared_font = true
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "000400000011C400"
@@ -16,3 +12,11 @@ release_date = "2014-11-21"
 title = "000400000011C500"
 region = "USA"
 release_date = "2014-11-21"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Pokemon-Sun-Moon/game.dat b/Pokemon-Sun-Moon/game.dat
index 506419f..a1f35a0 100644
--- a/Pokemon-Sun-Moon/game.dat
+++ b/Pokemon-Sun-Moon/game.dat
@@ -1,11 +1,7 @@
 title = "Pokémon Sun and Moon"
 description = "Pokémon Sun and Pokémon Moon are role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS. They are the first installments in the seventh generation of Pokémon games."
-compatibility = 1
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000164800"
@@ -16,3 +12,11 @@ release_date = "2016-11-18"
 title = "0004000000175E00"
 region = "USA"
 release_date = "2016-11-18"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Pokemon-Super-Mystery-Dungeon/game.dat b/Pokemon-Super-Mystery-Dungeon/game.dat
index 91b0f7a..aa1f64b 100644
--- a/Pokemon-Super-Mystery-Dungeon/game.dat
+++ b/Pokemon-Super-Mystery-Dungeon/game.dat
@@ -1,11 +1,7 @@
 title = "Pokémon Super Mystery Dungeon"
 description = "Pokémon Super Mystery Dungeon is a roguelike video game in the Pokémon Mystery Dungeon series developed by Spike Chunsoft and published by The Pokémon Company for the Nintendo 3DS handheld game console. Like its predecessors, players control a human who has awoken as a Pokémon in a world filled entirely by the series' eponymous creatures, and must travel through random-generated dungeons completing missions and battling enemies to unravel the story."
-compatibility = 2
-tested_date = "2017-06-05"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "jselby"
 
 [[ releases ]]
 title = "0004000000174600"
@@ -16,3 +12,11 @@ release_date = "2016-02-20"
 title = "0004000000174400"
 region = "EUR"
 release_date = "2016-02-20"
+
+[[ testcases ]]
+compatibility = 2
+date = "2017-06-05"
+version = "HEAD-8f0a23b"
+author = "jselby"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Pokemon-X-Y/game.dat b/Pokemon-X-Y/game.dat
index 6a8fb1f..ca1f8cb 100644
--- a/Pokemon-X-Y/game.dat
+++ b/Pokemon-X-Y/game.dat
@@ -1,11 +1,7 @@
 title = "Pokémon X and Y"
 description = "Pokémon X and Pokémon Y are role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS. They are the first installments in the sixth generation of the Pokémon series of role-playing games."
-compatibility = 3
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = true
 needs_shared_font = true
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000055D00"
@@ -16,3 +12,11 @@ release_date = "2013-10-12"
 title = "0004000000055E00"
 region = "USA"
 release_date = "2013-10-12"
+
+[[ testcases ]]
+compatibility = 3
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Puyo-Puyo-Chronicle/game.dat b/Puyo-Puyo-Chronicle/game.dat
index b3fc3de..d60a22d 100644
--- a/Puyo-Puyo-Chronicle/game.dat
+++ b/Puyo-Puyo-Chronicle/game.dat
@@ -1,13 +1,18 @@
 title = "Puyo Puyo Chronicles"
 description = "Puyo Puyo Chronicles is a game for the Nintendo 3DS as part of a celebration of Puyo Puyo's 25th Anniversary. Barring spinoffs, this is first Puyo game to be presented with 3D characters as opposed to 2D portraits."
-compatibility = 5
-tested_date = "2017-06-05"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = true
 needs_shared_font = true
-tested_by = "Clector"
 
 [[ releases ]]
 title = "0004000000197500"
 region = "JPN"
 release_date = "2016-12-08"
+
+
+[[ testcases ]]
+compatibility = 5
+date = "2017-06-05"
+version = "HEAD-8f0a23b"
+author = "Clector"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Star-Fox-64-3D/game.dat b/Star-Fox-64-3D/game.dat
index bd18136..38948d5 100644
--- a/Star-Fox-64-3D/game.dat
+++ b/Star-Fox-64-3D/game.dat
@@ -1,13 +1,17 @@
 title = "Star Fox 64 3D"
 description = "Star Fox 64 3D is a video game for the Nintendo 3DS and is a remake of Star Fox 64. It was co-developed between Nintendo EAD and Q-Games, and was published by Nintendo. It was released on July 14, 2011 in Japan, September 9, 2011 in Europe and North America, and on September 15, 2011 in Australia."
-compatibility = 1
-tested_date = "2017-06-04"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000049000"
 region = "USA"
 release_date = "2011-07-14"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-04"
+version = "HEAD-8f0a23b"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Story-of-Seasons-Trio-of-Towns/game.dat b/Story-of-Seasons-Trio-of-Towns/game.dat
index 92847d8..b10d7f7 100644
--- a/Story-of-Seasons-Trio-of-Towns/game.dat
+++ b/Story-of-Seasons-Trio-of-Towns/game.dat
@@ -1,8 +1,5 @@
 title = "Story of Seasons: Trio of Towns"
 description = "Story of Seasons: Trio of Towns is a farming simulation game developed by Marvelous for the Nintendo 3DS. In this installment, in addition to the usual farmland which the player owns, the player is able to visit three towns, each with their own distinct culture and lifestyles."
-compatibility = 0
-tested_date = "2017-06-05"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = false
 
@@ -10,3 +7,10 @@ needs_shared_font = false
 title = "000400000019F500"
 region = "USA"
 release_date = "2017-02-28"
+
+[[ testcases ]]
+compatibility = 0
+date = "2017-06-05"
+version = "HEAD-8f0a23b"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Super-Mario-3D-Land/game.dat b/Super-Mario-3D-Land/game.dat
index 2107749..0a8b41d 100644
--- a/Super-Mario-3D-Land/game.dat
+++ b/Super-Mario-3D-Land/game.dat
@@ -1,13 +1,17 @@
 title = "Super Mario 3D Land"
 description = "Super Mario 3D Land is a platform game in the Super Mario series developed by Nintendo EAD Tokyo, with development assistance from Brownie Brown, for the Nintendo 3DS. The game was the first in the Mario franchise to be released for the system and was released worldwide in November 2011."
-compatibility = 2
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = true
 needs_shared_font = false
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "0004000000054000"
 region = "USA"
 release_date = "2011-11-13"
+
+[[ testcases ]]
+compatibility = 2
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Super-Smash-Bros/game.dat b/Super-Smash-Bros/game.dat
index 28c29cb..84227d3 100644
--- a/Super-Smash-Bros/game.dat
+++ b/Super-Smash-Bros/game.dat
@@ -1,13 +1,17 @@
 title = "Super Smash Bros. for Nintendo 3DS"
 description = "Super Smash Bros. for Nintendo 3DS is a fighting video game developed by Sora Ltd. and Bandai Namco Games, with assistance from tri-Crescendo, and published by Nintendo for the Nintendo 3DS and video game consoles. Despite being similarly titled games, even with almost similar content, the two titles are officially considered the fourth and fifth versions, respectively, in the Super Smash Bros. series of games by creator and game director Masahiro Sakurai."
-compatibility = 1
-tested_date = "2017-05-31"
-tested_version = "HEAD-4857eb4"
 needs_system_files = true
 needs_shared_font = true
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "00040000000EDF00"
 region = "USA"
 release_date = "2014-10-3"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-05-31"
+version = "HEAD-4857eb4"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Virtual-Console-Legend-of-Zelda/game.dat b/Virtual-Console-Legend-of-Zelda/game.dat
index b142d47..bca69f6 100644
--- a/Virtual-Console-Legend-of-Zelda/game.dat
+++ b/Virtual-Console-Legend-of-Zelda/game.dat
@@ -1,13 +1,17 @@
 title = "Virtual Console: The Legend of Zelda"
 description = "The Legend of Zelda is an action-adventure video game developed and published by Nintendo and designed by Shigeru Miyamoto and Takashi Tezuka. Set in the fantasy land of Hyrule, the plot centers on a boy named Link, the playable protagonist, who aims to collect the eight fragments of the Triforce of Wisdom in order to rescue Princess Zelda from the antagonist, Ganon. During the course of the game, the player sees Link from a top-down perspective and must navigate him through the overworld and several dungeons, defeating enemies and finding secrets along the way."
-compatibility = 1
-tested_date = "2017-06-04"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = true
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "000400000006F100"
 region = "USA"
 release_date = "2012-07-05"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-04"
+version = "HEAD-8f0a23b"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file
diff --git a/Virtual-Console-Tetris/game.dat b/Virtual-Console-Tetris/game.dat
index da0e3e4..006b4d8 100644
--- a/Virtual-Console-Tetris/game.dat
+++ b/Virtual-Console-Tetris/game.dat
@@ -1,13 +1,17 @@
 title = "Virtual Console: Tetris"
 description = "Tetris is a puzzle video game for the Game Boy released in 1989.  A Nintendo 3DS Virtual Console version of Tetris was released in December 2011 and lacks the multiplayer functionality. It was delisted from the Nintendo eShop after December 31, 2014."
-compatibility = 1
-tested_date = "2017-06-04"
-tested_version = "HEAD-8f0a23b"
 needs_system_files = false
 needs_shared_font = true
-tested_by = "Flamboyant_Ham"
 
 [[ releases ]]
 title = "000400000007e700"
 region = "USA"
 release_date = "2011-12-22"
+
+[[ testcases ]]
+compatibility = 1
+date = "2017-06-04"
+version = "HEAD-8f0a23b"
+author = "Flamboyant_Ham"
+cpu = ""
+gpu = ""
\ No newline at end of file