diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb
index 9091e63..0c21b97 100644
--- a/app/controllers/phases_controller.rb
+++ b/app/controllers/phases_controller.rb
@@ -168,10 +168,6 @@
     @phase = Phase.find(params[:id])
     authorize @phase
     @phase.description = params["phase-desc"]
-    
-puts "VALID? #{@phase.valid?} - #{@phase.errors.collect{|e,m| "#{e}: #{m}"}.join(", ")}"
-puts @phases.inspect
-    
     if @phase.update_attributes(params[:phase])
       redirect_to admin_show_phase_path(@phase), notice: _('Information was successfully updated.')
     else
diff --git a/test/functional/phases_controller_test.rb b/test/functional/phases_controller_test.rb
index cf61fcb..ec87d77 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.first.org)
     
     @plan = Plan.create!(template: @template, title: 'Test Plan', 
                          roles: [Role.new(user: @user, creator: true)])
@@ -170,12 +170,6 @@
     assert_unauthorized_redirect_to_root_path
     
     sign_in @user
-
-    
-    
-    puts "SIGNING IN AS: #{@user.inspect}"
-    
-
     
     # Valid save
     put admin_update_phase_path(@template.phases.first), {phase: params}
diff --git a/test/functional/questions_controller_test.rb b/test/functional/questions_controller_test.rb
index a6ec082..0379a76 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.first.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 6f1a491..55d020e 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.first.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 75c69e9..174aa98 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.first.org)
   end
 
 # TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 91a71e7..ff0125b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -44,9 +44,6 @@
                          perms: Perm.where.not(name: ['admin', 'add_organisations', 'change_org_affiliation', 'grant_api_to_orgs']),
                          org: org, accept_terms: true, confirmed_at: Time.zone.now) 
     end
-    
-puts "USER: #{usr.email}"
-    
     usr
   end