limit to rspec 2 until we update specs for 3 compat, clean up and make sure we alias :schema_name with :database_name for connection options