diff --git a/test/functional/templates_controller_test.rb b/test/functional/templates_controller_test.rb
index f028aa1..f21755c 100644
--- a/test/functional/templates_controller_test.rb
+++ b/test/functional/templates_controller_test.rb
@@ -143,8 +143,9 @@
     
     # Invalid object
     post admin_create_template_path(Template.last.id), {template: {title: nil, org_id: @user.org.id}}
-    assert_response :redirect
-    assert_redirected_to admin_new_template_url(Template.last.id)
+    assert_response :success
+    assert assigns(:template)
+    # TODO: Should also probably display the reason why it failed!
   end
   
   # GET /org/admin/templates/:id/admin_update (admin_update_template_path)
@@ -176,9 +177,9 @@
     assert assigns(:template)
     
     # Make sure we get the right response when providing an invalid template
-    put admin_edit_template_path(@template), {template: {title: nil}}
+    put admin_update_template_path(@template), {template: {title: nil}}
     assert_response :redirect
-    assert_redirected_to edit_admin_template_url(Template.last.id)
+    assert_redirected_to admin_template_template_url(Template.last.id)
     assert assigns(:template)
     # TODO: Should also probably display the reason why it failed!
   end