diff --git a/test/functional/phases_controller_test.rb b/test/functional/phases_controller_test.rb
index ec87d77..3c0386a 100644
--- a/test/functional/phases_controller_test.rb
+++ b/test/functional/phases_controller_test.rb
@@ -8,7 +8,7 @@
     scaffold_template
     
     # Get the first Org Admin
-    @user = org_admin_from(@template.first.org)
+    @user = org_admin_from(@template.org)
     
     @plan = Plan.create!(template: @template, title: 'Test Plan', 
                          roles: [Role.new(user: @user, creator: true)])
diff --git a/test/functional/questions_controller_test.rb b/test/functional/questions_controller_test.rb
index 0379a76..1deaa50 100644
--- a/test/functional/questions_controller_test.rb
+++ b/test/functional/questions_controller_test.rb
@@ -9,7 +9,7 @@
     @section = @template.phases.first.sections.first
     
     # Get the first Org Admin
-    @user = org_admin_from(@template.first.org)
+    @user = org_admin_from(@template.org)
     
     @question_format = QuestionFormat.where(option_based: false).first
   end
diff --git a/test/functional/sections_controller_test.rb b/test/functional/sections_controller_test.rb
index 55d020e..53362ff 100644
--- a/test/functional/sections_controller_test.rb
+++ b/test/functional/sections_controller_test.rb
@@ -9,7 +9,7 @@
     @phase = @template.phases.first
     
     # Get the first Org Admin
-    @user = org_admin_from(@template.first.org)
+    @user = org_admin_from(@template.org)
   end
 
 # TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
diff --git a/test/functional/templates_controller_test.rb b/test/functional/templates_controller_test.rb
index 174aa98..0cfa3a2 100644
--- a/test/functional/templates_controller_test.rb
+++ b/test/functional/templates_controller_test.rb
@@ -8,7 +8,7 @@
     scaffold_template
     
     # Get the first Org Admin
-    @user = org_admin_from(@template.first.org)
+    @user = org_admin_from(@template.org)
   end
 
 # TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has