diff --git a/code/TestSessionController.php b/code/TestSessionController.php
index cd28761..71135cc 100644
--- a/code/TestSessionController.php
+++ b/code/TestSessionController.php
@@ -4,7 +4,7 @@
  */
 class TestSessionController extends Controller {
 
-	static $allowed_actions = array(
+	private static $allowed_actions = array(
 		'index',
 		'start',
 		'set',
@@ -98,8 +98,9 @@ class TestSessionController extends Controller {
 			throw new LogicException("Fixture file must be inside the tests subfolder of one of your modules.");
 		}
 
+		$factory = Injector::inst()->create('FixtureFactory');
 		$fixture = Injector::inst()->create('YamlFixture', $fixtureFile);
-		$fixture->saveIntoDatabase();
+		$fixture->writeInto($factory);
 
 		Session::add_to_array('testsession.fixtures', $fixtureFile);
 
diff --git a/templates/Includes/TestSession_State.ss b/templates/Includes/TestSession_State.ss
index 169959d..bcabd78 100644
--- a/templates/Includes/TestSession_State.ss
+++ b/templates/Includes/TestSession_State.ss
@@ -2,9 +2,9 @@
 <p>
 	Current testing state
 <ul>
-	<% control State %>
+	<% loop State %>
 	<li><strong>$Name:</strong> $Value</li>
-	<% end_control %>
+	<% end_loop %>
 </ul>
 </p>
 <% end_if %>
\ No newline at end of file