diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 5aabbf0..37139be 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -25,7 +25,7 @@
 	attr_accessible :abbreviation, :banner_text, :logo, :remove_logo, :domain, 
                   :logo_file_name, :name, :stylesheet_file_id, :target_url, 
                   :organisation_type_id, :wayfless_entity, :parent_id, :sort_name,
-                  :token_permission_type_ids, :language_id, :contact_email
+                  :token_permission_type_ids, :language_id, :contact_email, :language
 
   validates :contact_email, email: true, allow_nil: true
   validates :name, presence: true, uniqueness: true
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
new file mode 100644
index 0000000..df2ad7d
--- /dev/null
+++ b/test/functional/application_controller_test.rb
@@ -0,0 +1,77 @@
+require 'test_helper'
+
+class ApplicationControllerTest < ActionDispatch::IntegrationTest
+  include Devise::Test::IntegrationHelpers
+
+  setup do
+    @user = users(:cc_super)
+    
+    stub_blog_calls
+  end
+  
+  # In order to test methods on the application controller, we must call routes
+  # on controllers that extend the ApplicationController class.
+  
+  # ----------------------------------------------------------------
+  test "make sure unauthorized users are redirected to the root path" do
+    proj = Project.first
+    get project_path(I18n.locale, proj)
+    
+    assert_redirected_to "#{root_path}?locale=#{I18n.locale}"
+  end
+
+  # ----------------------------------------------------------------
+  test "we can change the locale by changing the URL" do
+    proj = Project.first
+    
+    if I18n.available_locales.count > 1
+      # Verify that passing a locale in the URL will set the locale
+      other = I18n.available_locales.last
+      
+      get project_path(other, proj)
+      assert_redirected_to "#{root_path}?locale=#{I18n.locale}", "Expected the changed locale to appear in the query string"
+      assert_equal other, I18n.locale, "Expected the locale to have been set when passing it in URL"
+    end
+  end
+  
+  # ----------------------------------------------------------------
+  test "a user's language specification is used if no locale is passed in the URL" do
+    if I18n.available_locales.count > 1
+      @user.language = Language.find_by(abbreviation: I18n.available_locales.last)
+      @user.save!
+      
+      sign_in @user
+      
+      get root_path
+      assert_equal @user.language.abbreviation.to_s, I18n.locale.to_s, "Expected the locale to have been set to the user's chosen language"
+      assert "#{projects_path}".starts_with?("/#{@user.language.abbreviation}/"), "Expected the system to use the user's language specification"
+    end
+  end
+  
+  # ----------------------------------------------------------------
+  test "a user's organisation language specification is used if no locale is passed in the URL and the user has no language setting" do
+    if I18n.available_locales.count > 1
+      @user.language = nil
+      @user.organisation[:language_id] = Language.find_by(abbreviation: I18n.available_locales.last).id
+      @user.save!
+      
+      sign_in @user
+      
+      get root_path
+      org_lang = Language.find(@user.organisation[:language_id]).abbreviation 
+      assert_equal org_lang.to_s, I18n.locale.to_s, "Expected the locale to have been set to the organisation's chosen language"
+      assert "#{projects_path}".starts_with?("/#{org_lang}/"), "Expected the system to use the organisation's language specification"
+    end
+  end
+
+  # ----------------------------------------------------------------
+  test "the last visited url is stored in the session" do
+    get root_path
+    assert_equal root_path, session[:previous_url]
+    
+    sign_in @user
+    get projects_path
+    assert_equal projects_path, session[:previous_url]
+  end
+  
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 70cee5b..5f705f6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -88,4 +88,29 @@
     parent.reload
     assert_includes parent.send("#{chld.pluralize}"), child, "was expecting the #{prnt}.#{chld.pluralize} to contain the #{chld}"
   end
+  
+# STUBS FOR CALLS To EXTERNAL SITES
+  # ----------------------------------------------------------------------
+  def stub_blog_calls
+    blog_feed = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><rss version=\"2.0\" " +
+                      "xml:base=\"http://www.example.com/stubbed/blog\" " +
+                      "xmlns:dc=\"http://purl.org/dc/elements/1.1\">" +
+                "<channel>" +
+                  "<title>Testing</title>" +
+                  "<link>http://www.example.com/stubbed/blog/feed</link>" +
+                  "<item>" +
+                    "<title>Stub blog post</title>" +
+                    "<link>http://www.example.com/stubbed/blog/articles/1</link>" +
+                    "<description>This is a stuubed blog post</description>" +
+                    "<category domain=\"http://www.example.com/stubbed/blog\">Test</category>" +
+                    "<pubDate>Thu, 03 Nov 2016 12:38:17 +0000</pubDate>" +
+                    "<dc:creator />" +
+                    "<guid isPermaLink=\"false\">1 at http://www.example.com/stubbed/blog</guid>" +
+                  "</item>" +
+                "</channel>"
+  
+    stub_request(:get, "http://www.dcc.ac.uk/news/dmponline-0/feed").
+      with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.2'}).
+      to_return(:status => 200, :body => blog_feed, :headers => {})
+  end
 end