diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index 90d50f3228..9f59e18e95 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -42,7 +42,8 @@ def admin_update
     @org.logo = attrs[:logo] if attrs[:logo]
     tab = (attrs[:feedback_enabled].present? ? "feedback" : "profile")
     @org.links = ActiveSupport::JSON.decode(params[:org_links]) if params[:org_links].present?
-
+    attrs.delete(:org_links)
+    
     # Only allow super admins to change the org types and shib info
     if current_user.can_super_admin?
       identifiers = []
diff --git a/app/views/branded/layouts/application.html.erb b/app/views/branded/layouts/application.html.erb
index 3b67531179..f855c9df6f 100644
--- a/app/views/branded/layouts/application.html.erb
+++ b/app/views/branded/layouts/application.html.erb
@@ -91,7 +91,7 @@
               active_page?(user_orcid_omniauth_callback_path) %>
       <!-- Modal windows for sign in/out -->
       <% unless user_signed_in? %>
-        <% if  Rails.configuration.x.shibboleth_use_filtered_discovery_service %>
+        <% if  Rails.configuration.x.shibboleth.use_filtered_discovery_service %>
           <div id="shib-ds-form" class="modal fade" tabindex="-1" role="dialog">
             <%= render partial: 'shared/shib_ds_form' %>
           </div>
diff --git a/app/views/branded/layouts/mobile/_fixed_menu.html.erb b/app/views/branded/layouts/mobile/_fixed_menu.html.erb
index eb25fed57d..2e6f7a770d 100644
--- a/app/views/branded/layouts/mobile/_fixed_menu.html.erb
+++ b/app/views/branded/layouts/mobile/_fixed_menu.html.erb
@@ -63,12 +63,12 @@
                 <i class="fas fa-sort-desc" aria-hidden="true">&nbsp;</i>
               </a>
               <ul class="dropdown-menu" aria-labelledby="signin-menu-button">
-                <% if  Rails.configuration.x.shibboleth_enabled %>
+                <% if  Rails.configuration.x.shibboleth.enabled %>
                   <!-- Shibboleth DS enabled -->
                   <li>
                     <% if request.fullpath != "/users/sign_up?nosplash=true" &&
                           session[:shibboleth_data].nil? %>
-                      <% if  Rails.configuration.x.shibboleth_use_filtered_discovery_service %>
+                      <% if  Rails.configuration.x.shibboleth.use_filtered_discovery_service %>
                         <%= link_to _('Sign in through an affiliated institution'), '#',
                             'data-toggle': 'modal',
                             'data-target': '#shib-ds-form' %>
diff --git a/app/views/branded/shared/_get_started.html.erb b/app/views/branded/shared/_get_started.html.erb
index 7b93e500e2..4be0afb673 100644
--- a/app/views/branded/shared/_get_started.html.erb
+++ b/app/views/branded/shared/_get_started.html.erb
@@ -5,7 +5,7 @@
       <br>
       <div class="form-group">
         <% step_counter = 1 %>
-        <% if Rails.configuration.x.shibboleth_enabled %>
+        <% if Rails.configuration.x.shibboleth.enabled %>
           <!-- Shibboleth DS enabled -->
           <% if request.fullpath != "/users/sign_up?nosplash=true" && session[:shibboleth_data].nil? then%>
             <h3><%= _('Option %{number}: If your institution is affiliated with DMPTool.') % { number: step_counter } %></h3>
diff --git a/spec/controllers/orgs_controller_spec.rb b/spec/controllers/orgs_controller_spec.rb
index bf3b57a1d7..c2666131fb 100644
--- a/spec/controllers/orgs_controller_spec.rb
+++ b/spec/controllers/orgs_controller_spec.rb
@@ -41,7 +41,7 @@
 
     it "succeeds" do
       @args.delete(:feedback_enabled)
-      put :admin_update, params: { id: @org.id, org: @args }
+      put :admin_update, params: { id: @org.id, org: @args, org_links: @args[:org_links] }
       expect(response).to redirect_to("#{admin_edit_org_path(@org)}#profile")
       expect(flash[:notice].present?).to eql(true)
       @org.reload
diff --git a/spec/features/locales_spec.rb b/spec/features/locales_spec.rb
index 7afff076be..9d58574097 100644
--- a/spec/features/locales_spec.rb
+++ b/spec/features/locales_spec.rb
@@ -6,6 +6,7 @@
 
   before(:each) do
     # Clear out the default defined in the locales support file
+    Org.destroy_all
     Language.destroy_all
   end
 
diff --git a/spec/features/super_admins/orgs_spec.rb b/spec/features/super_admins/orgs_spec.rb
index 04e41b5854..d0639fc669 100644
--- a/spec/features/super_admins/orgs_spec.rb
+++ b/spec/features/super_admins/orgs_spec.rb
@@ -50,7 +50,7 @@
     # -------------------------------------------------------------
 
     nbr_links = all('.link').length
-    addLink
+    add_link
     expect(all('.link').length).to eql(nbr_links + 1)
   end
 
@@ -72,9 +72,9 @@
     # end DMPTool customization
     # -------------------------------------------------------------
 
-    addLink
+    add_link
     nbr_links = all('.link').length
-    removeLink
+    remove_link
     expect(all('.link').length).to eql(nbr_links - 1)
   end
 
diff --git a/spec/mixins/controllers/dmptool/orgs_controller_spec.rb b/spec/mixins/controllers/dmptool/orgs_controller_spec.rb
index 5668f9bc1a..6350eb86ca 100644
--- a/spec/mixins/controllers/dmptool/orgs_controller_spec.rb
+++ b/spec/mixins/controllers/dmptool/orgs_controller_spec.rb
@@ -55,7 +55,7 @@
     it "redirects to the shibboleth IdP" do
       id = create(:identifier, identifiable: @org, identifier_scheme: @shib)
       @org = @org.reload
-      post shibboleth_ds_path, { id: @org.id }
+      post shibboleth_ds_path(id: @org.id)
 
       location = response.headers["Location"]
       expect(location.include?(Rails.application.config.shibboleth_login)).to eql(true)
diff --git a/spec/mixins/controllers/dmptool/users/omniauth_callbacks_controller_spec.rb b/spec/mixins/controllers/dmptool/users/omniauth_callbacks_controller_spec.rb
index 2e4500eed5..8a1a66ec57 100644
--- a/spec/mixins/controllers/dmptool/users/omniauth_callbacks_controller_spec.rb
+++ b/spec/mixins/controllers/dmptool/users/omniauth_callbacks_controller_spec.rb
@@ -191,7 +191,7 @@
       before(:each) do
         @hash = {
           info: {
-            name: Faker::Movies::StarWars.character,
+            name: Faker::Music::PearlJam.musician,
             email: Faker::Internet.email,
             identity_provider: @entity_id.value
           }
@@ -243,27 +243,27 @@
         expect(@controller.send(:extract_omniauth_names, hash: nil)).to eql({})
       end
       it "handles :givenname" do
-        hash = { givenname: Faker::Movies::StarWars.character.split.first }
+        hash = { givenname: Faker::Music::PearlJam.musician.split.first }
         result = @controller.send(:extract_omniauth_names, hash: hash)
         expect(result[:firstname]).to eql(hash[:givenname])
       end
       it "handles :firstname" do
-        hash = { firstname: Faker::Movies::StarWars.character.split.first }
+        hash = { firstname: Faker::Music::PearlJam.musician.split.first }
         result = @controller.send(:extract_omniauth_names, hash: hash)
         expect(result[:firstname]).to eql(hash[:firstname])
       end
       it "handles :lastname" do
-        hash = { lastname: Faker::Movies::StarWars.character.split.first }
+        hash = { lastname: Faker::Music::PearlJam.musician.split.first }
         result = @controller.send(:extract_omniauth_names, hash: hash)
         expect(result[:surname]).to eql(hash[:lastname])
       end
       it "handles :surname" do
-        hash = { surname: Faker::Movies::StarWars.character.split.first }
+        hash = { surname: Faker::Music::PearlJam.musician.split.first }
         result = @controller.send(:extract_omniauth_names, hash: hash)
         expect(result[:surname]).to eql(hash[:surname])
       end
       it "correctly splits :name into first and last" do
-        hash = { name: Faker::Movies::StarWars.character }
+        hash = { name: Faker::Music::PearlJam.musician }
         result = @controller.send(:extract_omniauth_names, hash: hash)
         names = hash[:name].split
         expect(result[:firstname]).to eql(names.length > 1 ? names.first : nil)
diff --git a/spec/mixins/models/dmptool/org_spec.rb b/spec/mixins/models/dmptool/org_spec.rb
index 727d6b6f4a..15d1beca3f 100644
--- a/spec/mixins/models/dmptool/org_spec.rb
+++ b/spec/mixins/models/dmptool/org_spec.rb
@@ -34,7 +34,7 @@
         expect(@unmanaged.shibbolized?).to eql(false)
       end
       it "returns true" do
-        org = Org.participating.first
+        org = Org.participating.last
         expect(org.shibbolized?).to eql(true)
       end
     end
diff --git a/spec/mixins/presenters/dmptool/org_presenter_spec.rb b/spec/mixins/presenters/dmptool/org_presenter_spec.rb
index 043c7dacc6..7b9eccfd1d 100644
--- a/spec/mixins/presenters/dmptool/org_presenter_spec.rb
+++ b/spec/mixins/presenters/dmptool/org_presenter_spec.rb
@@ -14,12 +14,12 @@
 
     describe "#initialize" do
       it "initializes if a shibboleth scheme is available" do
-        expect(@presenter.is_a?(Presenters::Dmptool::OrgPresenter)).to eql(true)
+        expect(@presenter.is_a?(Dmptool::OrgPresenter)).to eql(true)
       end
       it "initializes if a shibboleth scheme is NOT available" do
         @scheme.destroy
         presenter = described_class.new
-        expect(presenter.is_a?(Presenters::Dmptool::OrgPresenter)).to eql(true)
+        expect(presenter.is_a?(Dmptool::OrgPresenter)).to eql(true)
       end
     end
 
diff --git a/spec/views/branded/contact_us/contacts/_new_right.html.erb_spec.rb b/spec/views/branded/contact_us/contacts/_new_right.html.erb_spec.rb
index 657d09fc92..26952a4c89 100644
--- a/spec/views/branded/contact_us/contacts/_new_right.html.erb_spec.rb
+++ b/spec/views/branded/contact_us/contacts/_new_right.html.erb_spec.rb
@@ -26,15 +26,15 @@
       line_4: org[:address_line4],
       country: org[:address_country]
     }
-    # rubocop:enable Naming/VariableNumber
     render
-    expect(rendered.include?("<strong>#{org[:name]}")).to eql(true)
-    expect(rendered.include?("#{org[:address_line1]}<br>")).to eql(true)
-    expect(rendered.include?("#{org[:address_line2]}<br>")).to eql(true)
-    expect(rendered.include?("#{org[:address_line3]}<br>")).to eql(true)
-    expect(rendered.include?("#{org[:address_line4]}<br>")).to eql(true)
+    expect(rendered.include?("<strong>#{CGI::escapeHTML(org[:name])}")).to eql(true)
+    expect(rendered.include?("#{org[:address_line_1]}<br>")).to eql(true)
+    expect(rendered.include?("#{org[:address_line_2]}<br>")).to eql(true)
+    expect(rendered.include?("#{org[:address_line_3]}<br>")).to eql(true)
+    expect(rendered.include?("#{org[:address_line_4]}<br>")).to eql(true)
     expect(rendered.include?("#{org[:address_country]}<br>")).to eql(true)
     expect(rendered.include?("<iframe")).to eql(true)
+    # rubocop:enable Naming/VariableNumber
   end
 
 end
diff --git a/spec/views/branded/layouts/_analytics.html.erb_spec.rb b/spec/views/branded/layouts/_analytics.html.erb_spec.rb
index 747f4d5883..2724ebd196 100644
--- a/spec/views/branded/layouts/_analytics.html.erb_spec.rb
+++ b/spec/views/branded/layouts/_analytics.html.erb_spec.rb
@@ -8,53 +8,54 @@
     controller.prepend_view_path "app/views/branded"
     org = create(:org, name: ApplicationService.application_name,
                        abbreviation: ApplicationService.application_name)
-    create(:tracker, org: org)
+    create(:tracker, org: org, code: "UA-123456789-0")
     org.reload
-    gkey = org.trackers.last.value
+    @gkey = org.tracker.code
     @expected_usersnap = "//api.usersnap.com/load/#{SecureRandom.uuid}.js"
-    @expected_google = "https://www.googletagmanager.com/gtag/js?id=#{gkey}"
     Rails.env.stubs(:stage?).returns(true)
+    Rails.env.stubs(:production?).returns(false)
+    Rails.configuration.x.google_analytics.tracker_root = @gkey
     Rails.application.credentials.stubs(:usersnap).returns({ key: @expected_usersnap })
     Rails.configuration.x.google_analytics.tracker_root = ApplicationService.application_name
   end
 
   context "renders nothing" do
-    it "when Rails.configuration.branding[:keys] is empty" do
-      Rails.configuration.branding[:keys] = []
+    it "when Rails.configuration.x.google_analytics.tracker_root is empty" do
+      Rails.configuration.x.google_analytics.tracker_root = nil
       render
-      expect(rendered.include?(@expected_usersnap)).to eql(false)
-      expect(rendered.include?(@expected_google)).to eql(false)
+      expect(rendered.include?(@expected_usersnap)).to eql(true)
+      expect(rendered.include?(@gkey)).to eql(false)
     end
     it "when :usersnap_key and :google_analytics_key are not present" do
-      Rails.configuration.branding[:keys] = []
+      Rails.configuration.x.google_analytics.tracker_root = nil
+      Rails.application.credentials.stubs(:usersnap).returns({ key: nil })
       render
       expect(rendered.include?(@expected_usersnap)).to eql(false)
-      expect(rendered.include?(@expected_google)).to eql(false)
+      expect(rendered.include?(@gkey)).to eql(false)
     end
     it "when Rails.env.stage? and Rails.env.production? are false" do
-      Rails.configuration.branding[:keys] = @keys
       Rails.env.stubs(:stage?).returns(false)
       Rails.env.stubs(:production?).returns(false)
       render
       expect(rendered.include?(@expected_usersnap)).to eql(false)
-      expect(rendered.include?(@expected_google)).to eql(false)
+      expect(rendered.include?(@gkey)).to eql(false)
     end
   end
 
   it "Rails.env.stage?" do
-    Rails.configuration.branding[:keys] = @keys
     Rails.env.stubs(:stage?).returns(true)
+    Rails.env.stubs(:production?).returns(false)
     render
     expect(rendered.include?(@expected_usersnap)).to eql(true)
-    expect(rendered.include?(@expected_google)).to eql(true)
+    expect(rendered.include?(@gkey)).to eql(true)
   end
 
   it "Rails.env.production?" do
-    Rails.configuration.branding[:keys] = @keys
+    Rails.env.stubs(:stage?).returns(false)
     Rails.env.stubs(:production?).returns(true)
     render
     expect(rendered.include?(@expected_usersnap)).to eql(false)
-    expect(rendered.include?(@expected_google)).to eql(true)
+    expect(rendered.include?(@gkey)).to eql(true)
   end
 
 end
diff --git a/spec/views/branded/layouts/_logo.html.erb_spec.rb b/spec/views/branded/layouts/_logo.html.erb_spec.rb
index ec6b4e8e0d..212733625f 100644
--- a/spec/views/branded/layouts/_logo.html.erb_spec.rb
+++ b/spec/views/branded/layouts/_logo.html.erb_spec.rb
@@ -23,9 +23,6 @@
   it "renders correctly when user is logged in" do
     sign_in create(:user, org: @org)
     render
-
-p rendered
-
     expect(rendered.include?("org-logo")).to eql(true)
     expect(rendered.include?(@org.name)).to eql(true)
     expect(rendered.include?("app-logo")).to eql(false)
diff --git a/spec/views/branded/layouts/application.html.erb_spec.rb b/spec/views/branded/layouts/application.html.erb_spec.rb
index 3cfbd2e2f8..7908ed0a61 100644
--- a/spec/views/branded/layouts/application.html.erb_spec.rb
+++ b/spec/views/branded/layouts/application.html.erb_spec.rb
@@ -5,13 +5,13 @@
 describe "layouts/application.html.erb" do
 
   before(:each) do
-    @app_name = Faker::Company.name
+    @app_name = ApplicationService.application_name
     Rails.configuration.x.application.name = @app_name
     controller.prepend_view_path "app/views/branded"
   end
 
   it "displays correctly when user is not logged in and Shib is NOT enabled" do
-    Rails.configuration.shibboleth.use_filtered_discovery_service = false
+    Rails.configuration.x.shibboleth.use_filtered_discovery_service = false
     render
     expect(response).to render_template(partial: "layouts/_analytics")
     expect(rendered.include?("<title>#{@app_name}")).to eql(true)
@@ -30,7 +30,7 @@
   end
 
   it "displays correctly when user is not logged in and Shib is enabled" do
-    Rails.configuration.shibboleth.use_filtered_discovery_service = true
+    Rails.configuration.x.shibboleth.use_filtered_discovery_service = true
     render
     expect(response).to render_template(partial: "layouts/_analytics")
     expect(rendered.include?("<title>#{@app_name}")).to eql(true)
@@ -49,7 +49,7 @@
   end
 
   it "displays correctly when user is logged in" do
-    Rails.configuration.shibboleth.use_filtered_discovery_service = true
+    Rails.configuration.x.shibboleth.use_filtered_discovery_service = true
     sign_in create(:user)
     render
     expect(response).to render_template(partial: "layouts/_analytics")
diff --git a/spec/views/branded/layouts/mobile/_fixed_menu.html.erb_spec.rb b/spec/views/branded/layouts/mobile/_fixed_menu.html.erb_spec.rb
index 6bce8e3c51..fbbba52daf 100644
--- a/spec/views/branded/layouts/mobile/_fixed_menu.html.erb_spec.rb
+++ b/spec/views/branded/layouts/mobile/_fixed_menu.html.erb_spec.rb
@@ -10,9 +10,9 @@
 
   context "user not logged in when Shibboleth is enabled" do
     it "renders our version of the page" do
-      Rails.application.config.shibboleth_enabled = true
+      Rails.configuration.x.shibboleth.enabled = true
       render
-      expect(rendered.include?("DMPTool_logo_blue_shades_v1b3b.svg")).to eql(true)
+      expect(rendered.include?("DMPTool_logo_blue_shades_v1b3b")).to eql(true)
       expect(rendered.include?("Sign in")).to eql(true)
       expect(rendered.include?("Sign in through an affiliated institution")).to eql(true)
       expect(rendered.include?("Sign in with your email address")).to eql(true)
@@ -27,9 +27,9 @@
 
   context "user not logged in when Shibboleth is NOT enabled" do
     it "renders our version of the page" do
-      Rails.application.config.shibboleth_enabled = false
+      Rails.configuration.x.shibboleth.enabled = false
       render
-      expect(rendered.include?("DMPTool_logo_blue_shades_v1b3b.svg")).to eql(true)
+      expect(rendered.include?("DMPTool_logo_blue_shades_v1b3b")).to eql(true)
       expect(rendered.include?("Sign in")).to eql(true)
       expect(rendered.include?("Sign in through an affiliated institution")).to eql(false)
       expect(rendered.include?("Sign in with your email address")).to eql(true)
diff --git a/spec/views/branded/paginable/orgs/_public.html.erb_spec.rb b/spec/views/branded/paginable/orgs/_public.html.erb_spec.rb
index 561906d2e8..de07ec2c3e 100644
--- a/spec/views/branded/paginable/orgs/_public.html.erb_spec.rb
+++ b/spec/views/branded/paginable/orgs/_public.html.erb_spec.rb
@@ -11,7 +11,7 @@
 
     controller.prepend_view_path "app/views/branded"
     assign :paginable_path_params, { sort_field: "orgs.name", sort_direction: :asc }
-    assign :paginable_params, { controller: "paginable/orgs", action: "public" }
+    assign :args, { controller: "paginable/orgs", action: "public" }
     # Paginable is expecting `scope` to be a local not an instance variable
     render partial: "paginable/orgs/public", locals: { scope: Org.participating }
     expect(rendered.include?("Institutional Signin Enabled")).to eql(true)
diff --git a/spec/views/branded/paginable/templates/_publicly_visible.html.erb_spec.rb b/spec/views/branded/paginable/templates/_publicly_visible.html.erb_spec.rb
index a47136977d..f3b06357bc 100644
--- a/spec/views/branded/paginable/templates/_publicly_visible.html.erb_spec.rb
+++ b/spec/views/branded/paginable/templates/_publicly_visible.html.erb_spec.rb
@@ -9,7 +9,7 @@
     2.times { create(:template, :published, org: org) }
     controller.prepend_view_path "app/views/branded"
     assign :paginable_path_params, { sort_field: "templates.title", sort_direction: :asc }
-    assign :paginable_params, { controller: "paginable/orgs", action: "public" }
+    assign :args, { controller: "paginable/orgs", action: "public" }
     # Paginable is expecting `scope` to be a local not an instance variable
     render partial: "paginable/templates/publicly_visible", locals: { scope: Template.all }
     expect(rendered.include?("Template")).to eql(true)
diff --git a/spec/views/branded/shared/org_branding.html.erb_spec.rb b/spec/views/branded/shared/org_branding.html.erb_spec.rb
index 19ea6d2911..02d990dd1d 100644
--- a/spec/views/branded/shared/org_branding.html.erb_spec.rb
+++ b/spec/views/branded/shared/org_branding.html.erb_spec.rb
@@ -12,7 +12,7 @@
     @org.logo = nil
     assign :user, build(:user, org: @org)
     render
-    expect(rendered.include?("<h1>#{@org.name}</h1>")).to eql(true)
+    expect(rendered.include?("<h1>#{CGI::escapeHTML(@org.name)}</h1>")).to eql(true)
   end
 
   it "renders the Org logo if available" do
diff --git a/spec/views/branded/user_mailer/admin_privileges.html.erb_spec.rb b/spec/views/branded/user_mailer/admin_privileges.html.erb_spec.rb
deleted file mode 100644
index f3815e9b99..0000000000
--- a/spec/views/branded/user_mailer/admin_privileges.html.erb_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe "user_mailer/admin_privileges.html.erb" do
-  before(:each) do
-    @url = "https://github.com/CDLUC3/dmptool/wiki/Help-for-Administrators"
-    controller.prepend_view_path "app/views/branded"
-  end
-
-  it "renders the email for a user who received Admin privileges" do
-    user = create(:user, :org_admin)
-    assign :user, user
-    render
-    expect(rendered.include?("Hello #{user.name(false)}")).to eql(true)
-    expect(rendered.include?("granted")).to eql(true)
-    expect(rendered.include?(@url)).to eql(true)
-  end
-
-  it "renders the email for the user whose Admin privileges have been revoked" do
-    user = create(:user)
-    assign :user, user
-    render
-    expect(rendered.include?("Hello #{user.name(false)}")).to eql(true)
-    expect(rendered.include?("revoked")).to eql(true)
-    expect(rendered.include?(@url)).to eql(true)
-  end
-
-end
diff --git a/spec/views/branded/user_mailer/api_plan_creation.html.erb_spec.rb b/spec/views/branded/user_mailer/api_plan_creation.html.erb_spec.rb
deleted file mode 100644
index b6a6fbf41f..0000000000
--- a/spec/views/branded/user_mailer/api_plan_creation.html.erb_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe "user_mailer/api_plan_creation.html.erb" do
-
-  xit "renders the email" do
-    controller.prepend_view_path "app/views/branded"
-    plan = create(:plan)
-    contributor = build(:contributor, plan: plan)
-    assign :plan, plan
-    assign :contributor, contributor
-    render
-    expect(rendered.include?(plan.id.to_s)).to eql(true)
-    expect(rendered.include?(plan.title)).to eql(true)
-    expect(rendered.include?(contributor.email)).to eql(true)
-  end
-
-end