diff --git a/tests/AnimeClient/FormGeneratorTest.php b/tests/AnimeClient/FormGeneratorTest.php
index 88b4b014..b3096098 100644
--- a/tests/AnimeClient/FormGeneratorTest.php
+++ b/tests/AnimeClient/FormGeneratorTest.php
@@ -270,7 +270,7 @@ class FormGeneratorTest extends AnimeClientTestCase {
 			foreach ($fields as $name => $config)
 			{
 				$html = $this->generator->generate($name, $config);
-				$this->assertMatchesHtmlSnapshot($html);
+				$this->assertMatchesSnapshot($html);
 			}
 		}
 	}
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__1.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__1.php
new file mode 100644
index 00000000..8206ba74
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__1.php
@@ -0,0 +1,3 @@
+<?php return '<label><input type="radio" name="enabled" value="1" /> Yes</label>
+<label><input type="radio" name="enabled" value="0" checked /> No</label>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__10.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__10.php
new file mode 100644
index 00000000..2fc21a3b
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__10.php
@@ -0,0 +1,2 @@
+<?php return '<input id="connection" type="text" name="connection" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__11.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__11.php
new file mode 100644
index 00000000..ea5de9fd
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__11.php
@@ -0,0 +1,2 @@
+<?php return '<input id="kitsu_username" type="text" name="kitsu_username" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__12.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__12.php
new file mode 100644
index 00000000..b1e33914
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__12.php
@@ -0,0 +1,2 @@
+<?php return '<input id="whose_list" type="text" name="whose_list" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__13.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__13.php
new file mode 100644
index 00000000..d1f4af33
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__13.php
@@ -0,0 +1,6 @@
+<?php return '<select id="theme" name="theme">
+    <option value="auto">Automatically match OS theme</option>
+    <option value="light">Original Light Theme</option>
+    <option value="dark">Dark Theme</option>
+</select>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__14.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__14.php
new file mode 100644
index 00000000..d4346410
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__14.php
@@ -0,0 +1,3 @@
+<?php return '<label><input type="radio" name="show_anime_collection" value="1" /> Yes</label>
+<label><input type="radio" name="show_anime_collection" value="0" checked /> No</label>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__15.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__15.php
new file mode 100644
index 00000000..b0f88bdd
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__15.php
@@ -0,0 +1,3 @@
+<?php return '<label><input type="radio" name="show_manga_collection" value="1" /> Yes</label>
+<label><input type="radio" name="show_manga_collection" value="0" checked /> No</label>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__16.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__16.php
new file mode 100644
index 00000000..804a1a2e
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__16.php
@@ -0,0 +1,5 @@
+<?php return '<select id="default_list" name="default_list">
+    <option value="anime">Anime</option>
+    <option value="manga">Manga</option>
+</select>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__17.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__17.php
new file mode 100644
index 00000000..a82a2acb
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__17.php
@@ -0,0 +1,9 @@
+<?php return '<select id="default_anime_list_path" name="default_anime_list_path">
+    <option value="watching">Watching</option>
+    <option value="plan_to_watch">Plan to Watch</option>
+    <option value="on_hold">On Hold</option>
+    <option value="dropped">Dropped</option>
+    <option value="completed">Completed</option>
+    <option value="all">All</option>
+</select>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__18.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__18.php
new file mode 100644
index 00000000..0ce5af29
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__18.php
@@ -0,0 +1,9 @@
+<?php return '<select id="default_manga_list_path" name="default_manga_list_path">
+    <option value="reading">Reading</option>
+    <option value="plan_to_read">Plan to Read</option>
+    <option value="on_hold">On Hold</option>
+    <option value="dropped">Dropped</option>
+    <option value="completed">Completed</option>
+    <option value="all">All</option>
+</select>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__19.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__19.php
new file mode 100644
index 00000000..8934dafb
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__19.php
@@ -0,0 +1,6 @@
+<?php return '<select id="type" name="type">
+    <option value="mysql">MySQL</option>
+    <option value="pgsql">PostgreSQL</option>
+    <option value="sqlite">SQLite</option>
+</select>
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__2.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__2.php
new file mode 100644
index 00000000..9fc4ac0e
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__2.php
@@ -0,0 +1,2 @@
+<?php return '<input id="client_id" type="text" name="client_id" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__20.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__20.php
new file mode 100644
index 00000000..bd5f0d42
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__20.php
@@ -0,0 +1,2 @@
+<?php return '<input id="host" type="text" name="host" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__21.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__21.php
new file mode 100644
index 00000000..2b561aef
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__21.php
@@ -0,0 +1,2 @@
+<?php return '<input id="user" type="text" name="user" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__22.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__22.php
new file mode 100644
index 00000000..1b1ec486
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__22.php
@@ -0,0 +1,2 @@
+<?php return '<input id="pass" type="text" name="pass" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__23.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__23.php
new file mode 100644
index 00000000..9085638f
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__23.php
@@ -0,0 +1,2 @@
+<?php return '<input id="port" type="text" name="port" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__24.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__24.php
new file mode 100644
index 00000000..dfb792e8
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__24.php
@@ -0,0 +1,2 @@
+<?php return '<input id="database" type="text" name="database" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__25.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__25.php
new file mode 100644
index 00000000..982bef2e
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__25.php
@@ -0,0 +1,2 @@
+<?php return '<input id="file" type="text" name="file" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__3.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__3.php
new file mode 100644
index 00000000..a3597a93
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__3.php
@@ -0,0 +1,2 @@
+<?php return '<input id="client_secret" type="text" name="client_secret" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__4.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__4.php
new file mode 100644
index 00000000..3dcdd0be
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__4.php
@@ -0,0 +1,2 @@
+<?php return '<input id="username" type="text" name="username" value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__5.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__5.php
new file mode 100644
index 00000000..cd149af8
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__5.php
@@ -0,0 +1,2 @@
+<?php return '<input id="access_token" type="text" name="access_token" readonly value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__6.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__6.php
new file mode 100644
index 00000000..294d675b
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__6.php
@@ -0,0 +1,2 @@
+<?php return '<input id="access_token_expires" type="text" name="access_token_expires" readonly value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__7.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__7.php
new file mode 100644
index 00000000..c8650aa1
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__7.php
@@ -0,0 +1,2 @@
+<?php return '<input id="refresh_token" type="text" name="refresh_token" readonly value="" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__8.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__8.php
new file mode 100644
index 00000000..05321fb5
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__8.php
@@ -0,0 +1,2 @@
+<?php return '<input type="hidden" name="special_hidden_flag" value="foo_bar" />
+';
diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__9.php b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__9.php
new file mode 100644
index 00000000..ee7f474c
--- /dev/null
+++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__9.php
@@ -0,0 +1,7 @@
+<?php return '<select id="driver" name="driver">
+    <option value="apcu">APCu</option>
+    <option value="memcached">Memcached</option>
+    <option value="redis">Redis</option>
+    <option value="null">No Cache</option>
+</select>
+';