diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1bef3f1f..d81450d1 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,7 +23,7 @@ class ApplicationController < ActionController::Base
   end
 
   def check_subdomain
-    if request.subdomain.present?
+    if request.subdomain.present? && Rails.env != 'test'
       redirect_to 'http://' + request.domain + request.port_string + request.fullpath
     end
   end
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 1e150a28..e8bdae24 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -230,7 +230,7 @@ class Warpable < ActiveRecord::Base
 
     if rotation == 6
       puts 'rotated CCW'
-      source_corners = [[0,self.width],[0,0],[self.height,0],[self.height,self.width]]
+      source_corners = source_corners = [[0,self.height],[0,0],[self.width,0],[self.width,self.height]]
     elsif rotation == 8
       puts 'rotated CW'
       source_corners = [[self.height,0],[self.height,self.width],[0,self.width],[0,0]]