fix failing tests

Includes a monkey patch for Arel that may need to be removed when 4.0.0 final ships

test/controllers/data_controller_test.rb

@@ -1,19 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require 'data_controller'
-
-# Re-raise errors caught by the controller.
-class DataController; def rescue_action(e) raise e end; end
 
 class DataControllerTest < ActionController::TestCase
-  fixtures :users, :preferences, :projects, :notes
 
   def setup
-    @controller = DataController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
   end
 
-  # Replace this with your real tests.
   def test_csv_export_completes_without_error
     login_as :admin_user
     get :csv_notes