diff --git a/lib/textris/base.rb b/lib/textris/base.rb
index 6ef3dec..3a10333 100644
--- a/lib/textris/base.rb
+++ b/lib/textris/base.rb
@@ -42,9 +42,7 @@ def call_action
     end
 
     def render_content
-      renderer = ActionController::Base.renderer.new
-
-      renderer.render(
+      ApplicationController.render(
         template: template_name,
         layout: false,
         formats: [:text],
diff --git a/lib/textris/delivery/mail.rb b/lib/textris/delivery/mail.rb
index e07d798..9222205 100644
--- a/lib/textris/delivery/mail.rb
+++ b/lib/textris/delivery/mail.rb
@@ -79,7 +79,7 @@ def get_template_interpolation(key, variables)
       def get_rails_variable(var)
         case var
         when 'app'
-          Rails.application.class.module_parent_name
+          Rails.application.class.try(:module_parent_name)
         when 'env'
           Rails.env
         end
diff --git a/lib/textris/delivery/twilio.rb b/lib/textris/delivery/twilio.rb
index c51e0b8..172ad91 100644
--- a/lib/textris/delivery/twilio.rb
+++ b/lib/textris/delivery/twilio.rb
@@ -17,7 +17,7 @@ def deliver(to)
           options[:media_url] = message.media_urls
         end
 
-        client.messages.create(options)
+        client.messages.create(**options)
       end
 
       private
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5a72840..52d7e66 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,6 +8,7 @@
 require 'active_support/testing/time_helpers'
 
 CodeClimate::TestReporter.configuration.logger = Logger.new("/dev/null")
+Sidekiq.strict_args!(false)
 
 if Scrutinizer::Ocular.should_run? ||
     CodeClimate::TestReporter.run? ||
@@ -33,6 +34,10 @@
 require_relative '../lib/textris'
 
 RSpec.configure do |config|
+  config.before(:suite) do
+    ApplicationController = ActionController::Base.renderer.new
+  end
+
   config.include ActiveSupport::Testing::TimeHelpers
 
   config.expect_with :rspec do |expectations|
diff --git a/spec/textris/delivery/mail_spec.rb b/spec/textris/delivery/mail_spec.rb
index dfeeb41..adac9cf 100644
--- a/spec/textris/delivery/mail_spec.rb
+++ b/spec/textris/delivery/mail_spec.rb
@@ -20,9 +20,10 @@ class Application < OpenStruct; end
 
     Rails = OpenStruct.new(
       :application => MyAppName::Application.new(
-        :config => OpenStruct.new
+        :config => OpenStruct.new,
+        class: OpenStruct.new(module_parent_name: 'MyAppName')
       ),
-      :env => 'test'
+      :env => 'test',
     )
 
     class FakeMail