diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index 803479f..d28a754 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -11,7 +11,8 @@
     if @question.save!
       redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully created.')
     else
-      render action: "phases/admin_show"
+      flash[:notice] = generate_error_notice(@question)
+      render "phases/admin_show"
     end
   end
 
@@ -26,7 +27,8 @@
     if @question.update_attributes(params[:question])
       redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully updated.')
     else
-      render action: "phases/admin_show"
+      flash[:notice] = generate_error_notice(@question)
+      render "phases/admin_show"
     end
   end
 
diff --git a/test/functional/questions_controller_test.rb b/test/functional/questions_controller_test.rb
new file mode 100644
index 0000000..e1d506b
--- /dev/null
+++ b/test/functional/questions_controller_test.rb
@@ -0,0 +1,119 @@
+class QuestionsControllerTest < ActionDispatch::IntegrationTest
+  
+  include Devise::Test::IntegrationHelpers
+  
+  setup do
+    scaffold_template
+    @section = @template.phases.first.sections.first
+    
+    # Get the first Org Admin
+    @user = User.where(org: @template.org).select{|u| u.can_org_admin?}.first
+    
+    @question_format = QuestionFormat.where(option_based: false).first
+  end
+
+# TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+#       these defined. They are defined multiple times though and we need to clean this up! In particular
+#       look at the unnamed routes after 'new_plan_phase' below. They are not named because they are duplicates.
+#       We should just have:
+#
+# SHOULD BE:
+# --------------------------------------------------
+#   questions            GET    /templates/:template_id/phases/:phase_id/sections/:section_id/questions     sections#index
+#                        POST   /templates/:template_id/phases/:phase_id/sections/:section_id/questions     sections#create
+#   question             GET    /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id  sections#show
+#                        PATCH  /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id  sections#update
+#                        PUT    /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id  sections#update
+#                        DELETE /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id  sections#destroy
+#
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+#   admin_create_question  POST    /org/admin/templates/questions/:id/admin_create    questions#admin_create
+#   admin_update_question  PUT     /org/admin/templates/questions/:id/admin_update    questions#admin_update
+#   admin_destroy_question DELETE  /org/admin/templates/questions/:id/admin_destroy   questions#admin_destroy
+#
+#   admin_questions        GET     /admin/questions                                   admin/questions#index
+#                          POST    /admin/questions                                   admin/questions#create
+#   new_admin_question     GET     /admin/questions/new                               admin/questions#new
+#   edit_admin_question    GET     /admin/questions/:id/edit                          admin/questions#edit
+#   admin_question         GET     /admin/questions/:id                               admin/questions#show
+#                          PATCH   /admin/questions/:id                               admin/questions#update
+#                          PUT     /admin/questions/:id                               admin/questions#update
+#                          DELETE  /admin/questions/:id                               admin/questions#destroy
+  
+  
+  
+  # POST /org/admin/templates/questions/:id/admin_create (admin_create_question_path)
+  # ----------------------------------------------------------
+  test "create a new question" do
+    params = {section_id: @section.id, text: 'Test Question', number: 9, question_format: @question_format}
+    
+    # Should redirect user to the root path if they are not logged in!
+    post admin_create_question_path(@section), {question: params}
+    assert_unauthorized_redirect_to_root_path
+    
+    sign_in @user
+    
+    post admin_create_question_path(@section), {question: params}
+    assert_response :redirect
+    assert assigns(:question)
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: Question.last.id)
+    assert_equal _('Information was successfully created.'), flash[:notice]
+    
+    # Invalid object
+    post admin_create_question_path(@section), {question: {section_id: @section.id, text: nil}}
+    assert_response :redirect
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id)
+    assert assigns(:question)
+    assert flash[:notice].starts_with?(_('Unable to save your changes.'))
+  end 
+  
+  # PUT /org/admin/templates/questions/:id/admin_update (admin_update_question_path)
+  # ----------------------------------------------------------
+  test "update the question" do
+    params = {text: 'Question - UPDATE'}
+    
+    # Should redirect user to the root path if they are not logged in!
+    put admin_update_question_path(@section.questions.first), {question: params}
+    assert_unauthorized_redirect_to_root_path
+    
+    sign_in @user
+    
+    # Valid save
+    put admin_update_question_path(@section.questions.first), {question: params}
+    assert_response :redirect
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: Question.last.id)
+    assert assigns(:phase)
+    assert assigns(:section)
+    assert assigns(:question)
+    assert_equal _('Information was successfully updated.'), flash[:notice]
+    
+    # Invalid save
+    put admin_update_question_path(@section.questions.first), {question: {text: nil}}
+    assert_response :redirect
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: Question.last.id)
+    assert assigns(:phase)
+    assert assigns(:section)
+    assert assigns(:question)
+    assert flash[:notice].starts_with?(_('Unable to save your changes.'))
+  end
+  
+  # DELETE /org/admin/templates/questions/:id/admin_destroy (admin_destroy_question_path)
+  # ----------------------------------------------------------
+  test "delete the question" do
+    # Should redirect user to the root path if they are not logged in!
+    delete admin_destroy_question_path(id: @section.id, question_id: @section.questions.first.id)
+    assert_unauthorized_redirect_to_root_path
+    
+    sign_in @user
+    
+    delete admin_destroy_question_path(id: @section.id, question_id: @section.questions.first.id)
+    assert_response :redirect
+    assert assigns(:phase)
+    assert assigns(:section)
+    assert assigns(:question)
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id)
+    assert_equal _('Information was successfully deleted.'), flash[:notice]
+  end
+  
+end
\ No newline at end of file