diff --git a/lib/wasabi.rb b/lib/wasabi.rb
index bfdffed..6d458b3 100644
--- a/lib/wasabi.rb
+++ b/lib/wasabi.rb
@@ -1,6 +1,7 @@
 require 'wasabi/version'
 require 'wasabi/document'
 require 'wasabi/resolver'
+require 'wasabi/importer'
 
 class Wasabi
 
@@ -12,38 +13,32 @@ class Wasabi
 
   def initialize(wsdl, request = nil)
     resolver = Resolver.new(request)
+    importer = Importer.new(resolver, self)
 
-    xml = resolver.resolve(wsdl)
-    document = Nokogiri.XML(xml)
-
-    @parser = Parser.new(document)
+    @documents, @schemas = importer.import(wsdl)
   end
 
-  attr_reader :parser
+  attr_reader :documents, :schemas
 
   def service_name
-    @parser.service_name
+    @documents.service_name
   end
 
-  # TODO: move this to an operation.
+  # TODO: move this up to the operation.
   def endpoint
-    @parser.endpoint
+    @documents.endpoint
   end
 
   def target_namespace
-    @parser.target_namespace
+    @documents.target_namespace
   end
 
   def namespaces
-    @parser.namespaces
-  end
-
-  def schemas
-    @parser.schemas
+    @documents.namespaces
   end
 
   def operation(operation_name)
-    @parser.operations[operation_name]
+    @documents.operations[operation_name]
   end
 
 end
diff --git a/lib/wasabi/document.rb b/lib/wasabi/document.rb
index ff05e08..ce6cef1 100644
--- a/lib/wasabi/document.rb
+++ b/lib/wasabi/document.rb
@@ -1,115 +1,70 @@
-require "nokogiri"
-require "wasabi/resolver"
-require "wasabi/parser"
+require 'wasabi/schema'
+require 'wasabi/legacy_operation_parser'
 
 class Wasabi
-
-  # = Wasabi::Document
-  #
-  # Represents a WSDL document.
   class Document
 
-    # Accepts a WSDL +document+ to parse.
-    def initialize(document = nil)
-      self.document = document
+    def initialize(document, wsdl)
+      @document = document
+      @wsdl = wsdl
     end
 
-    attr_accessor :document, :request, :xml
-
-    alias_method :document?, :document
-
-    # Returns the SOAP endpoint.
-    def endpoint
-      @endpoint ||= parser.endpoint
+    def service_name
+      @document.root['name']
     end
 
-    # Sets the SOAP endpoint.
-    attr_writer :endpoint
-
-    # Returns the target namespace.
     def target_namespace
-      @target_namespace ||= parser.target_namespace
+      @document.root['targetNamespace']
     end
 
-    # Sets the target namespace.
-    attr_writer :target_namespace
-
-    # Returns a list of available SOAP actions.
-    def soap_actions
-      @soap_actions ||= parser.operations.keys
-    end
-
-    # Returns a map of SOAP operations.
-    def operations
-      @operations ||= parser.operations
+    def namespaces
+      @namespaces ||= collect_namespaces(@document, *schema_nodes)
     end
 
-    # Returns the service name.
-    def service_name
-      @service_name ||= parser.service_name
+    def schemas
+      @schemas ||= schema_nodes.map { |node| Schema.new(node, @wsdl) }
     end
 
-    attr_writer :service_name
+    def imports
+      imports = []
 
-    def namespaces
-      parser.namespaces
-    end
-
-    # XXX: legacy interface. change savon to use the new types interface.
-    def type_namespaces
-      @type_namespaces ||= begin
-        namespaces = []
-        parser.schemas.types.each do |name, type|
-          namespaces << [[name], type.namespace]
-          type.children.each { |child| namespaces << [[name, child[:name]], type.namespace] }
-        end if document
-        namespaces
+      @document.xpath('/wsdl:definitions/wsdl:import', 'wsdl' => Wasabi::WSDL).each do |node|
+        location = node['location']
+        imports << location if location
       end
-    end
 
-    # XXX: legacy interface. change savon to use the new types interface.
-    def type_definitions
-      @type_definitions ||= begin
-        result = []
-        parser.schemas.types.each do |name, type|
-          type.children.each do |child|
-            # how can we properly handle anyType elements here?
-            # see Type#parse_element
-            next unless child[:type]
-
-            tag, nsid = child[:type].split(":").reverse
-            result << [[name, child[:name]], tag] if user_defined(nsid)
-          end
-        end if document
-        result
-      end
+      imports
     end
 
-    # Returns whether the given +namespace+ was defined manually.
-    def user_defined(namespace)
-      uri = parser.namespaces[namespace]
-      !(uri =~ %r{^http://schemas.xmlsoap.org} || uri =~ %r{^http://www.w3.org})
+    def operations
+      @operations ||= LegacyOperationParser.new(@document).operations
     end
 
-    # Returns the raw WSDL document.
-    # Can be used as a hook to extend the library.
-    def xml
-      @xml ||= Resolver.new(request).resolve(document)
+    def service_node
+      @document.at_xpath('/wsdl:definitions/wsdl:service', 'wsdl' => Wasabi::WSDL)
     end
 
-    def parser
-      @parser ||= guard_parse && parse
+    private
+
+    def schema_nodes
+      @schema_nodes ||= begin
+        types = @document.at_xpath('/wsdl:definitions/wsdl:types', 'wsdl' => Wasabi::WSDL)
+        types ? types.element_children : []
+      end
     end
 
-  private
+    def collect_namespaces(*nodes)
+      namespaces = {}
 
-    def guard_parse
-      return true if document
-      raise ArgumentError, "Wasabi needs a WSDL document"
-    end
+      nodes.each do |node|
+        node.namespaces.each do |k, v|
+          key = k.sub(/^xmlns:/, '')
+          namespaces[key] = v
+        end
+      end
 
-    def parse
-      Parser.new Nokogiri::XML(xml)
+      namespaces.delete('xmlns')
+      namespaces
     end
 
   end
diff --git a/lib/wasabi/document_collection.rb b/lib/wasabi/document_collection.rb
new file mode 100644
index 0000000..d5a56fd
--- /dev/null
+++ b/lib/wasabi/document_collection.rb
@@ -0,0 +1,57 @@
+require 'uri'
+
+class Wasabi
+  class DocumentCollection
+    include Enumerable
+
+    def initialize
+      @documents = []
+    end
+
+    def <<(document)
+      @documents << document
+    end
+
+    def each(&block)
+      @documents.each(&block)
+    end
+
+    def service_name
+      @service_name ||= first.service_name
+    end
+
+    def target_namespace
+      @target_namespace ||= first.target_namespace
+    end
+
+    def target_namespace
+      @target_namespace ||= first.target_namespace
+    end
+
+    def namespaces
+      @namespaces ||= inject({}) { |memo, document| memo.merge(document.namespaces) }
+    end
+
+    def operations
+      @operations ||= inject({}) { |memo, document| memo.merge(document.operations) }
+    end
+
+    # TODO: this works for now, but it should be moved into the Operation,
+    #       because there can be different endpoints for different operations.
+    def endpoint
+      return @endpoint if @endpoint
+
+      if service = first.service_node
+        endpoint = service.at_xpath(".//soap11:address/@location", 'soap11' => Wasabi::SOAP_1_1)
+        endpoint ||= service.at_xpath(service_node, ".//soap12:address/@location", 'soap12' => Wasabi::SOAP_1_2)
+      end
+
+      begin
+        @endpoint = URI(URI.escape(endpoint.to_s)) if endpoint
+      rescue URI::InvalidURIError
+        @endpoint = nil
+      end
+    end
+
+  end
+end
diff --git a/lib/wasabi/importer.rb b/lib/wasabi/importer.rb
new file mode 100644
index 0000000..9201b1d
--- /dev/null
+++ b/lib/wasabi/importer.rb
@@ -0,0 +1,40 @@
+require 'nokogiri'
+require 'wasabi/document'
+require 'wasabi/document_collection'
+require 'wasabi/schema_collection'
+
+class Wasabi
+  class Importer
+
+    def initialize(resolver, wsdl)
+      @resolver = resolver
+      @wsdl = wsdl
+    end
+
+    def import(location)
+      documents = DocumentCollection.new
+      schemas = SchemaCollection.new
+
+      import! [location] do |document|
+        documents << document
+        schemas.push(document.schemas)
+      end
+
+      [documents, schemas]
+    end
+
+    private
+
+    def import!(locations, &block)
+      locations.each do |location|
+        xml = @resolver.resolve(location)
+        document = Document.new Nokogiri.XML(xml), @wsdl
+
+        block.call(document)
+
+        import! document.imports, &block
+      end
+    end
+
+  end
+end
diff --git a/lib/wasabi/operations.rb b/lib/wasabi/legacy_operation_parser.rb
similarity index 89%
rename from lib/wasabi/operations.rb
rename to lib/wasabi/legacy_operation_parser.rb
index 6b27daf..c5af52a 100644
--- a/lib/wasabi/operations.rb
+++ b/lib/wasabi/legacy_operation_parser.rb
@@ -2,10 +2,10 @@
 require 'wasabi/operation'
 
 class Wasabi
-  class Operations
+  class LegacyOperationParser
 
-    def initialize(parser)
-      @parser = parser
+    def initialize(document)
+      @document = document
 
       @operations = {}
       parse
@@ -21,12 +21,12 @@ def parse
     end
 
     def parse_messages
-      messages = @parser.document.root.element_children.select { |node| node.name == 'message' }
+      messages = @document.root.element_children.select { |node| node.name == 'message' }
       @messages = Hash[messages.map { |node| [node['name'], node] }]
     end
 
     def parse_port_types
-      port_types = @parser.document.root.element_children.select { |node| node.name == 'portType' }
+      port_types = @document.root.element_children.select { |node| node.name == 'portType' }
       @port_types = Hash[port_types.map { |node| [node['name'], node] }]
     end
 
@@ -40,7 +40,7 @@ def parse_port_type_operations
     end
 
     def parse_operations
-      operations = @parser.document.xpath("wsdl:definitions/wsdl:binding/wsdl:operation", 'wsdl' => Wasabi::WSDL)
+      operations = @document.xpath("wsdl:definitions/wsdl:binding/wsdl:operation", 'wsdl' => Wasabi::WSDL)
       operations.each do |operation|
         name = operation.attribute("name").to_s
 
diff --git a/lib/wasabi/parser.rb b/lib/wasabi/parser.rb
deleted file mode 100644
index e1dbafc..0000000
--- a/lib/wasabi/parser.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-require 'uri'
-require "wasabi/schema_collection"
-require 'wasabi/schema'
-require "wasabi/operations"
-
-class Wasabi
-  class Parser
-
-    def initialize(document)
-      @document = document
-    end
-
-    attr_reader :document
-
-    def service_name
-      @document.root['name']
-    end
-
-    def target_namespace
-      @document.root['targetNamespace']
-    end
-
-    def namespaces
-      @namespaces ||= collect_namespaces(@document, *schema_nodes)
-    end
-
-    def schemas
-      @schemas ||= begin
-        schemas = schema_nodes.map { |node| Schema.new(node, self) }
-        SchemaCollection.new(schemas)
-      end
-    end
-
-    def operations
-      @operations ||= Operations.new(self).operations
-    end
-
-    # TODO: this works for now, but it should be moved into the Operation,
-    #       because there can be different endpoints for different operations.
-    def endpoint
-      return @endpoint if @endpoint
-
-      if service = service_node
-        endpoint = service.at_xpath(".//soap11:address/@location", 'soap11' => Wasabi::SOAP_1_1)
-        endpoint ||= service.at_xpath(service_node, ".//soap12:address/@location", 'soap12' => Wasabi::SOAP_1_2)
-      end
-
-      begin
-        @endpoint = URI(URI.escape(endpoint.to_s)) if endpoint
-      rescue URI::InvalidURIError
-        @endpoint = nil
-      end
-    end
-
-    private
-
-    def collect_namespaces(*nodes)
-      namespaces = {}
-
-      nodes.each do |node|
-        node.namespaces.each do |k, v|
-          key = k.sub(/^xmlns:/, '')
-          namespaces[key] = v
-        end
-      end
-
-      namespaces.delete('xmlns')
-      namespaces
-    end
-
-    def schema_nodes
-      @schema_nodes ||= begin
-        types = @document.at_xpath('/wsdl:definitions/wsdl:types', 'wsdl' => Wasabi::WSDL)
-        types ? types.element_children : []
-      end
-    end
-
-    def service_node
-      @document.at_xpath('/wsdl:definitions/wsdl:service', 'wsdl' => Wasabi::WSDL)
-    end
-
-  end
-end
diff --git a/lib/wasabi/schema.rb b/lib/wasabi/schema.rb
index f9f9ecd..250efdf 100644
--- a/lib/wasabi/schema.rb
+++ b/lib/wasabi/schema.rb
@@ -5,15 +5,13 @@ class Schema
 
     CHILD_TYPES = %w[element complexType simpleType]
 
-    def initialize(schema, parser)
+    def initialize(schema, wsdl)
       @schema = schema
+      @wsdl = wsdl
 
       @target_namespace     = @schema['targetNamespace']
       @element_form_default = @schema['elementFormDefault']
 
-      # TODO: get rid of this dependency.
-      @parser = parser
-
       @elements      = {}
       @complex_types = {}
       @simple_types  = {}
@@ -40,13 +38,13 @@ def parse_types
 
         case node.name
         when 'element'
-          type = Type.new(node, @parser)
+          type = Type.new(node, @wsdl)
           @elements[type_name] = type
         when 'complexType'
-          type = Type.new(node, @parser)
+          type = Type.new(node, @wsdl)
           @complex_types[type_name] = type
         when 'simpleType'
-          simple_type = SimpleType.new(node, @parser)
+          simple_type = SimpleType.new(node, @wsdl)
           @simple_types[type_name] = simple_type
         end
       end
diff --git a/lib/wasabi/schema_collection.rb b/lib/wasabi/schema_collection.rb
index 78343da..d20afe4 100644
--- a/lib/wasabi/schema_collection.rb
+++ b/lib/wasabi/schema_collection.rb
@@ -2,8 +2,16 @@ class Wasabi
   class SchemaCollection
     include Enumerable
 
-    def initialize(schemas)
-      @schemas = schemas
+    def initialize
+      @schemas = []
+    end
+
+    def <<(schema)
+      @schemas << schema
+    end
+
+    def push(schemas)
+      @schemas += schemas
     end
 
     def each(&block)
diff --git a/lib/wasabi/type.rb b/lib/wasabi/type.rb
index d13d52f..dffa1a0 100644
--- a/lib/wasabi/type.rb
+++ b/lib/wasabi/type.rb
@@ -2,9 +2,9 @@ class Wasabi
 
   class SimpleType
 
-    def initialize(node, parser)
+    def initialize(node, wsdl)
       @node = node
-      @parser = parser
+      @wsdl = wsdl
     end
 
     def type
@@ -18,9 +18,9 @@ def type
 
   class Type
 
-    def initialize(node, parser)
+    def initialize(node, wsdl)
       @node = node
-      @parser = parser
+      @wsdl = wsdl
 
       @name = node['name']
     end
@@ -65,7 +65,7 @@ def parse_complex_type(complex_type, name)
 
       complex_type.xpath('./xs:complexContent/xs:extension[@base]', 'xs' => Wasabi::XSD).each do |extension|
         base = extension.attribute('base').value.match(/\w+$/).to_s
-        base_type = @parser.schemas.types.fetch(base) { raise "expected to find extension base #{base} in types" }
+        base_type = @wsdl.schemas.types.fetch(base) { raise "expected to find extension base #{base} in types" }
 
         children += base_type.children
       end
@@ -82,7 +82,7 @@ def parse_element(element)
       _, nsid = type && type.split(':').reverse
 
       if nsid
-        namespace = @parser.namespaces.fetch(nsid)
+        namespace = @wsdl.namespaces.fetch(nsid)
         simple_type = namespace == Wasabi::XSD
       else
         # assume that elements with a @type qname lacking an nsid to reference the xml schema.
diff --git a/spec/fixtures/bookt.wsdl b/spec/fixtures/bookt.wsdl
new file mode 100644
index 0000000..3e2d238
--- /dev/null
+++ b/spec/fixtures/bookt.wsdl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- http://connect.bookt.com/svc/connect.svc?wsdl -->
+<wsdl:definitions name="Connect" targetNamespace="https://connect.bookt.com/svc" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:i0="http://tempuri.org/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="https://connect.bookt.com/svc" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+   <wsdl:import namespace="http://tempuri.org/" location="http://connect.bookt.com/svc/connect.svc?wsdl=wsdl1"/>
+   <wsdl:types/>
+   <wsdl:service name="Connect">
+      <wsdl:port name="IConnect" binding="i0:IConnect">
+         <soap:address location="http://connect.bookt.com/svc/connect.svc"/>
+      </wsdl:port>
+   </wsdl:service>
+</wsdl:definitions>
diff --git a/spec/fixtures/bookt2.wsdl b/spec/fixtures/bookt2.wsdl
new file mode 100644
index 0000000..4968382
--- /dev/null
+++ b/spec/fixtures/bookt2.wsdl
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- http://connect.bookt.com/svc/connect.svc?wsdl=wsdl1 -->
+<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:i0="https://connect.bookt.com/connect" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://tempuri.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+   <wsdl:import namespace="https://connect.bookt.com/connect" location="http://connect.bookt.com/svc/connect.svc?wsdl=wsdl0"/>
+   <wsdl:types/>
+   <wsdl:binding name="IConnect" type="i0:IConnect">
+      <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+      <wsdl:operation name="GetPropertyCategories">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetPropertyCategories" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetPropertyIDs">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetPropertyIDs" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetProperty">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetProperty" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetPropertyIDsByCategory">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetPropertyIDsByCategory" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetRates">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetRates" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetPerRoomRates">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetPerRoomRates" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetAvailability">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetAvailability" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="SetRates">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/SetRates" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="SetPerRoomRates">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/SetPerRoomRates" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="SetAvailability">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/SetAvailability" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="SetRatesAndAvailability">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/SetRatesAndAvailability" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetBooking">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetBooking" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="MakeBooking">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/MakeBooking" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="CancelBooking">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/CancelBooking" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="ModifyBooking">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/ModifyBooking" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="CreateLead">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/CreateLead" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="CreateEvent">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/CreateEvent" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetEventCategories">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetEventCategories" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetLead">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetLead" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetEvent">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetEvent" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetReviewIDs">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetReviewIDs" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetReview">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetReview" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetReviews">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetReviews" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="CreateReview">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/CreateReview" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="DeleteReview">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/DeleteReview" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetBusinessRules">
+         <soap:operation soapAction="https://connect.bookt.com/connect/IConnect/GetBusinessRules" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+   </wsdl:binding>
+</wsdl:definitions>
diff --git a/spec/fixtures/bookt3.wsdl b/spec/fixtures/bookt3.wsdl
new file mode 100644
index 0000000..caa1e6f
--- /dev/null
+++ b/spec/fixtures/bookt3.wsdl
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- http://connect.bookt.com/svc/connect.svc?wsdl=wsdl0 -->
+<wsdl:definitions targetNamespace="https://connect.bookt.com/connect" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="https://connect.bookt.com/connect" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+   <wsdl:types>
+      <xsd:schema targetNamespace="https://connect.bookt.com/connect/Imports">
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd0" namespace="https://connect.bookt.com/connect"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd3" namespace="http://connect.bookt.com/Schemas/Property.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd4" namespace="http://connect.bookt.com/Schemas/Fee.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd5" namespace="http://connect.bookt.com/Schemas/Media.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd6" namespace="http://connect.bookt.com/Schemas/Tax.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd7" namespace="http://connect.bookt.com/Schemas/Unit.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd8" namespace="http://connect.bookt.com/Schemas/Rate.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd9" namespace="http://connect.bookt.com/Schemas/Booking.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd10" namespace="http://connect.bookt.com/Schemas/Person.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd11" namespace="http://connect.bookt.com/Schemas/CreditCard.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd12" namespace="http://connect.bookt.com/Schemas/Statement.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd13" namespace="http://connect.bookt.com/Schemas/StatementDetail.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd14" namespace="http://connect.bookt.com/Schemas/Event.xsd"/>
+         <xsd:import schemaLocation="http://connect.bookt.com/svc/connect.svc?xsd=xsd15" namespace="http://connect.bookt.com/Schemas/Review.xsd"/>
+      </xsd:schema>
+   </wsdl:types>
+   <wsdl:message name="IConnect_GetPropertyCategories_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyCategories"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPropertyCategories_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyCategoriesResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPropertyIDs_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyIDs"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPropertyIDs_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyIDsResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetProperty_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetProperty"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetProperty_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPropertyIDsByCategory_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyIDsByCategory"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPropertyIDsByCategory_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetPropertyIDsByCategoryResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetRates_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetRates"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetRates_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetRatesResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPerRoomRates_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetPerRoomRates"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetPerRoomRates_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetPerRoomRatesResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetAvailability_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetAvailability"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetAvailability_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetAvailabilityResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetRates_InputMessage">
+      <wsdl:part name="parameters" element="tns:SetRates"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetRates_OutputMessage">
+      <wsdl:part name="parameters" element="tns:SetRatesResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetPerRoomRates_InputMessage">
+      <wsdl:part name="parameters" element="tns:SetPerRoomRates"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetPerRoomRates_OutputMessage">
+      <wsdl:part name="parameters" element="tns:SetPerRoomRatesResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetAvailability_InputMessage">
+      <wsdl:part name="parameters" element="tns:SetAvailability"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetAvailability_OutputMessage">
+      <wsdl:part name="parameters" element="tns:SetAvailabilityResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetRatesAndAvailability_InputMessage">
+      <wsdl:part name="parameters" element="tns:SetRatesAndAvailability"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_SetRatesAndAvailability_OutputMessage">
+      <wsdl:part name="parameters" element="tns:SetRatesAndAvailabilityResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetBooking_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetBooking"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetBooking_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetBookingResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_MakeBooking_InputMessage">
+      <wsdl:part name="parameters" element="tns:MakeBooking"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_MakeBooking_OutputMessage">
+      <wsdl:part name="parameters" element="tns:MakeBookingResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CancelBooking_InputMessage">
+      <wsdl:part name="parameters" element="tns:CancelBooking"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CancelBooking_OutputMessage">
+      <wsdl:part name="parameters" element="tns:CancelBookingResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_ModifyBooking_InputMessage">
+      <wsdl:part name="parameters" element="tns:ModifyBooking"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_ModifyBooking_OutputMessage">
+      <wsdl:part name="parameters" element="tns:ModifyBookingResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CreateLead_InputMessage">
+      <wsdl:part name="parameters" element="tns:CreateLead"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CreateLead_OutputMessage">
+      <wsdl:part name="parameters" element="tns:CreateLeadResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CreateEvent_InputMessage">
+      <wsdl:part name="parameters" element="tns:CreateEvent"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CreateEvent_OutputMessage">
+      <wsdl:part name="parameters" element="tns:CreateEventResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetEventCategories_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetEventCategories"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetEventCategories_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetEventCategoriesResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetLead_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetLead"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetLead_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetLeadResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetEvent_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetEvent"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetEvent_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetEventResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetReviewIDs_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetReviewIDs"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetReviewIDs_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetReviewIDsResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetReview_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetReview"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetReview_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetReviewResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetReviews_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetReviews"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetReviews_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetReviewsResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CreateReview_InputMessage">
+      <wsdl:part name="parameters" element="tns:CreateReview"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_CreateReview_OutputMessage">
+      <wsdl:part name="parameters" element="tns:CreateReviewResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_DeleteReview_InputMessage">
+      <wsdl:part name="parameters" element="tns:DeleteReview"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_DeleteReview_OutputMessage">
+      <wsdl:part name="parameters" element="tns:DeleteReviewResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetBusinessRules_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetBusinessRules"/>
+   </wsdl:message>
+   <wsdl:message name="IConnect_GetBusinessRules_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetBusinessRulesResponse"/>
+   </wsdl:message>
+   <wsdl:portType name="IConnect">
+      <wsdl:operation name="GetPropertyCategories">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyCategories" message="tns:IConnect_GetPropertyCategories_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyCategoriesResponse" message="tns:IConnect_GetPropertyCategories_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetPropertyIDs">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyIDs" message="tns:IConnect_GetPropertyIDs_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyIDsResponse" message="tns:IConnect_GetPropertyIDs_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetProperty">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetProperty" message="tns:IConnect_GetProperty_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyResponse" message="tns:IConnect_GetProperty_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetPropertyIDsByCategory">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyIDsByCategory" message="tns:IConnect_GetPropertyIDsByCategory_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPropertyIDsByCategoryResponse" message="tns:IConnect_GetPropertyIDsByCategory_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetRates">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetRates" message="tns:IConnect_GetRates_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetRatesResponse" message="tns:IConnect_GetRates_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetPerRoomRates">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPerRoomRates" message="tns:IConnect_GetPerRoomRates_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetPerRoomRatesResponse" message="tns:IConnect_GetPerRoomRates_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetAvailability">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetAvailability" message="tns:IConnect_GetAvailability_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetAvailabilityResponse" message="tns:IConnect_GetAvailability_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="SetRates">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/SetRates" message="tns:IConnect_SetRates_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/SetRatesResponse" message="tns:IConnect_SetRates_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="SetPerRoomRates">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/SetPerRoomRates" message="tns:IConnect_SetPerRoomRates_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/SetPerRoomRatesResponse" message="tns:IConnect_SetPerRoomRates_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="SetAvailability">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/SetAvailability" message="tns:IConnect_SetAvailability_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/SetAvailabilityResponse" message="tns:IConnect_SetAvailability_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="SetRatesAndAvailability">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/SetRatesAndAvailability" message="tns:IConnect_SetRatesAndAvailability_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/SetRatesAndAvailabilityResponse" message="tns:IConnect_SetRatesAndAvailability_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetBooking">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetBooking" message="tns:IConnect_GetBooking_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetBookingResponse" message="tns:IConnect_GetBooking_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="MakeBooking">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/MakeBooking" message="tns:IConnect_MakeBooking_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/MakeBookingResponse" message="tns:IConnect_MakeBooking_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="CancelBooking">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/CancelBooking" message="tns:IConnect_CancelBooking_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/CancelBookingResponse" message="tns:IConnect_CancelBooking_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="ModifyBooking">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/ModifyBooking" message="tns:IConnect_ModifyBooking_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/ModifyBookingResponse" message="tns:IConnect_ModifyBooking_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="CreateLead">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/CreateLead" message="tns:IConnect_CreateLead_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/CreateLeadResponse" message="tns:IConnect_CreateLead_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="CreateEvent">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/CreateEvent" message="tns:IConnect_CreateEvent_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/CreateEventResponse" message="tns:IConnect_CreateEvent_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetEventCategories">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetEventCategories" message="tns:IConnect_GetEventCategories_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetEventCategoriesResponse" message="tns:IConnect_GetEventCategories_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetLead">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetLead" message="tns:IConnect_GetLead_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetLeadResponse" message="tns:IConnect_GetLead_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetEvent">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetEvent" message="tns:IConnect_GetEvent_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetEventResponse" message="tns:IConnect_GetEvent_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetReviewIDs">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetReviewIDs" message="tns:IConnect_GetReviewIDs_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetReviewIDsResponse" message="tns:IConnect_GetReviewIDs_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetReview">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetReview" message="tns:IConnect_GetReview_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetReviewResponse" message="tns:IConnect_GetReview_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetReviews">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetReviews" message="tns:IConnect_GetReviews_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetReviewsResponse" message="tns:IConnect_GetReviews_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="CreateReview">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/CreateReview" message="tns:IConnect_CreateReview_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/CreateReviewResponse" message="tns:IConnect_CreateReview_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="DeleteReview">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/DeleteReview" message="tns:IConnect_DeleteReview_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/DeleteReviewResponse" message="tns:IConnect_DeleteReview_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetBusinessRules">
+         <wsdl:input wsaw:Action="https://connect.bookt.com/connect/IConnect/GetBusinessRules" message="tns:IConnect_GetBusinessRules_InputMessage"/>
+         <wsdl:output wsaw:Action="https://connect.bookt.com/connect/IConnect/GetBusinessRulesResponse" message="tns:IConnect_GetBusinessRules_OutputMessage"/>
+      </wsdl:operation>
+   </wsdl:portType>
+</wsdl:definitions>
diff --git a/spec/fixtures/import_port_types.wsdl b/spec/fixtures/bydexchange.wsdl
similarity index 84%
rename from spec/fixtures/import_port_types.wsdl
rename to spec/fixtures/bydexchange.wsdl
index 76f9fc0..c7f4b48 100644
--- a/spec/fixtures/import_port_types.wsdl
+++ b/spec/fixtures/bydexchange.wsdl
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- reference: savon issue #313 -->
+<!-- http://bydexchange.nbs-us.com/BYDExchangeServer.svc?wsdl -->
 <wsdl:definitions name="BYDExchangeServer" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://tempuri.org/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://bydexchange.nbs-us.com" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
    <wsdl:import namespace="http://bydexchange.nbs-us.com" location="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?wsdl=wsdl0"/>
    <wsdl:types/>
    <wsdl:binding name="BasicHttpBinding_IBYDExchangeServer" type="i0:IBYDExchangeServer">
       <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+      <wsdl:operation name="ListOrdersByCustomer">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/ListOrdersByCustomer" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="ListOrdersByDate">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/ListOrdersByDate" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
       <wsdl:operation name="ProductAvail">
          <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/ProductAvail" style="document"/>
          <wsdl:input>
diff --git a/spec/fixtures/bydexchange2.wsdl b/spec/fixtures/bydexchange2.wsdl
new file mode 100644
index 0000000..86acf7a
--- /dev/null
+++ b/spec/fixtures/bydexchange2.wsdl
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- http://bydexchange.nbs-us.com/BYDExchangeServer.svc?wsdl=wsdl0 -->
+<wsdl:definitions targetNamespace="http://bydexchange.nbs-us.com" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://bydexchange.nbs-us.com" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
+   <wsdl:types>
+      <xsd:schema targetNamespace="http://bydexchange.nbs-us.com/Imports">
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd0" namespace="http://bydexchange.nbs-us.com"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/BYDConnector.QuerySo3"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/BYDConnector.ProductAvail"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd4" namespace="http://schemas.datacontract.org/2004/07/BYDConnector.QUERYCUSTOMERIN1"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd5" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd6" namespace="http://schemas.datacontract.org/2004/07/NBSBYDLibrary"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd7" namespace="http://schemas.datacontract.org/2004/07/BYDConnector.SalesOrderin5"/>
+         <xsd:import schemaLocation="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?xsd=xsd8" namespace="http://schemas.datacontract.org/2004/07/BYDConnector.CustomerIN_V1"/>
+      </xsd:schema>
+   </wsdl:types>
+   <wsdl:message name="IBYDExchangeServer_ListOrdersByCustomer_InputMessage">
+      <wsdl:part name="parameters" element="tns:ListOrdersByCustomer"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ListOrdersByCustomer_OutputMessage">
+      <wsdl:part name="parameters" element="tns:ListOrdersByCustomerResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ListOrdersByDate_InputMessage">
+      <wsdl:part name="parameters" element="tns:ListOrdersByDate"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ListOrdersByDate_OutputMessage">
+      <wsdl:part name="parameters" element="tns:ListOrdersByDateResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ProductAvail_InputMessage">
+      <wsdl:part name="parameters" element="tns:ProductAvail"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ProductAvail_OutputMessage">
+      <wsdl:part name="parameters" element="tns:ProductAvailResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_listcustomers_InputMessage">
+      <wsdl:part name="parameters" element="tns:listcustomers"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_listcustomers_OutputMessage">
+      <wsdl:part name="parameters" element="tns:listcustomersResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ParseCSV_InputMessage">
+      <wsdl:part name="parameters" element="tns:ParseCSV"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_ParseCSV_OutputMessage">
+      <wsdl:part name="parameters" element="tns:ParseCSVResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_AddOrder_InputMessage">
+      <wsdl:part name="parameters" element="tns:AddOrder"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_AddOrder_OutputMessage">
+      <wsdl:part name="parameters" element="tns:AddOrderResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_GetOrder_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetOrder"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_GetOrder_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetOrderResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_AddCustomer_InputMessage">
+      <wsdl:part name="parameters" element="tns:AddCustomer"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_AddCustomer_OutputMessage">
+      <wsdl:part name="parameters" element="tns:AddCustomerResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_GetCustomer_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetCustomer"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_GetCustomer_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetCustomerResponse"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_Authenticate_InputMessage">
+      <wsdl:part name="parameters" element="tns:Authenticate"/>
+   </wsdl:message>
+   <wsdl:message name="IBYDExchangeServer_Authenticate_OutputMessage">
+      <wsdl:part name="parameters" element="tns:AuthenticateResponse"/>
+   </wsdl:message>
+   <wsdl:portType name="IBYDExchangeServer">
+      <wsdl:operation name="ListOrdersByCustomer">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ListOrdersByCustomer" message="tns:IBYDExchangeServer_ListOrdersByCustomer_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ListOrdersByCustomerResponse" message="tns:IBYDExchangeServer_ListOrdersByCustomer_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="ListOrdersByDate">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ListOrdersByDate" message="tns:IBYDExchangeServer_ListOrdersByDate_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ListOrdersByDateResponse" message="tns:IBYDExchangeServer_ListOrdersByDate_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="ProductAvail">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ProductAvail" message="tns:IBYDExchangeServer_ProductAvail_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ProductAvailResponse" message="tns:IBYDExchangeServer_ProductAvail_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="listcustomers">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/listcustomers" message="tns:IBYDExchangeServer_listcustomers_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/listcustomersResponse" message="tns:IBYDExchangeServer_listcustomers_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="ParseCSV">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ParseCSV" message="tns:IBYDExchangeServer_ParseCSV_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/ParseCSVResponse" message="tns:IBYDExchangeServer_ParseCSV_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="AddOrder">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/AddOrder" message="tns:IBYDExchangeServer_AddOrder_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/AddOrderResponse" message="tns:IBYDExchangeServer_AddOrder_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetOrder">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/GetOrder" message="tns:IBYDExchangeServer_GetOrder_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/GetOrderResponse" message="tns:IBYDExchangeServer_GetOrder_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="AddCustomer">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/AddCustomer" message="tns:IBYDExchangeServer_AddCustomer_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/AddCustomerResponse" message="tns:IBYDExchangeServer_AddCustomer_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetCustomer">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/GetCustomer" message="tns:IBYDExchangeServer_GetCustomer_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/GetCustomerResponse" message="tns:IBYDExchangeServer_GetCustomer_OutputMessage"/>
+      </wsdl:operation>
+      <wsdl:operation name="Authenticate">
+         <wsdl:input wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/Authenticate" message="tns:IBYDExchangeServer_Authenticate_InputMessage"/>
+         <wsdl:output wsaw:Action="http://bydexchange.nbs-us.com/IBYDExchangeServer/AuthenticateResponse" message="tns:IBYDExchangeServer_Authenticate_OutputMessage"/>
+      </wsdl:operation>
+   </wsdl:portType>
+</wsdl:definitions>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d75545f..ed3626c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,7 @@
-require "bundler"
-Bundler.require :default, :development
+require 'bundler'
+Bundler.setup
+
+require 'wasabi'
 
 unless RUBY_PLATFORM =~ /java/
   require "simplecov"
@@ -15,5 +17,6 @@
 Dir[support_files].each { |file| require file }
 
 RSpec.configure do |config|
-  config.include SpecSupport::Methods
+  config.include SpecSupport
+  config.mock_framework = :mocha
 end
diff --git a/spec/support/fixture.rb b/spec/support/fixture.rb
index 073ddc3..7b0316b 100644
--- a/spec/support/fixture.rb
+++ b/spec/support/fixture.rb
@@ -1,6 +1,7 @@
 module SpecSupport
 
   class Fixture
+
     def self.[](name)
       fixtures[name]
     end
@@ -31,12 +32,11 @@ def path
     def read
       Fixture[filename] ||= File.read(path)
     end
+
   end
 
-  module Methods
-    def fixture(*args)
-      Fixture.new(*args)
-    end
+  def fixture(*args)
+    Fixture.new(*args)
   end
 
 end
diff --git a/spec/support/mock_request.rb b/spec/support/mock_request.rb
new file mode 100644
index 0000000..fb3d5c4
--- /dev/null
+++ b/spec/support/mock_request.rb
@@ -0,0 +1,8 @@
+module SpecSupport
+
+  def mock_request(url, fixture_name)
+    response = HTTPI::Response.new 200, {}, fixture(fixture_name).read
+    HTTPI.expects(:get).with { |r| r.url == URI(url) }.returns(response)
+  end
+
+end
diff --git a/spec/wasabi/document_spec.rb b/spec/wasabi/document_spec.rb
deleted file mode 100644
index 3a3f397..0000000
--- a/spec/wasabi/document_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "spec_helper"
-
-describe Wasabi::Document do
-
-  subject { Wasabi::Document.new fixture(:authentication).read }
-
-  it "accepts a URL" do
-    HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
-
-    document = Wasabi::Document.new("http://example.com?wsdl")
-    document.xml.should == "wsdl"
-  end
-
-  it "accepts a path" do
-    document = Wasabi::Document.new fixture(:authentication).path
-    document.xml.should == fixture(:authentication).read
-  end
-
-  it "accepts raw XML" do
-    document = Wasabi::Document.new fixture(:authentication).read
-    document.xml.should == fixture(:authentication).read
-  end
-
-end
diff --git a/spec/wasabi/integration/bookt_spec.rb b/spec/wasabi/integration/bookt_spec.rb
new file mode 100644
index 0000000..f2471f3
--- /dev/null
+++ b/spec/wasabi/integration/bookt_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Wasabi do
+  context 'with: bookt.wsdl' do
+
+    subject(:wsdl)  { Wasabi.new(wsdl_url) }
+
+    let(:wsdl_url)  { 'http://connect.bookt.com/svc/connect.svc?wsdl' }
+    let(:wsdl2_url) { 'http://connect.bookt.com/svc/connect.svc?wsdl=wsdl1' }
+    let(:wsdl3_url) { 'http://connect.bookt.com/svc/connect.svc?wsdl=wsdl0' }
+
+    before do
+      mock_request wsdl_url,  :bookt
+      mock_request wsdl2_url, :bookt2
+      mock_request wsdl3_url, :bookt3
+    end
+
+    it 'resolves WSDL imports to get the operations' do
+      expect(wsdl.documents.operations).to_not be_empty
+    end
+
+  end
+end
+
diff --git a/spec/wasabi/integration/bydexchange_spec.rb b/spec/wasabi/integration/bydexchange_spec.rb
new file mode 100644
index 0000000..6cb3a3a
--- /dev/null
+++ b/spec/wasabi/integration/bydexchange_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Wasabi do
+  context 'with: bydexchange.wsdl' do
+
+    subject(:wsdl)  { Wasabi.new(wsdl_url) }
+
+    let(:wsdl_url)  { 'http://bydexchange.nbs-us.com/BYDExchangeServer.svc?wsdl' }
+    let(:wsdl2_url) { 'http://bydexchange.nbs-us.com/BYDExchangeServer.svc?wsdl=wsdl0' }
+
+    before do
+      mock_request wsdl_url,  :bydexchange
+      mock_request wsdl2_url, :bydexchange2
+    end
+
+    it 'resolves WSDL imports to get the operations' do
+      expect(wsdl.documents.operations.keys).to include(:get_customer)
+    end
+
+  end
+end
+
diff --git a/spec/wasabi/integration/economic_spec.rb b/spec/wasabi/integration/economic_spec.rb
index 0e185c1..5f19d76 100644
--- a/spec/wasabi/integration/economic_spec.rb
+++ b/spec/wasabi/integration/economic_spec.rb
@@ -8,7 +8,7 @@
     # XXX: this might be useless now that almost everything is parsed lazily.
     it 'has an ok parse-time for huge wsdl files' do
       #profiler = MethodProfiler.observe(Wasabi::Parser)
-      expect(wsdl.parser.operations.count).to eq(1511)
+      expect(wsdl.documents.operations.count).to eq(1511)
       #puts profiler.report
     end
 
diff --git a/spec/wasabi/parser/juniper_spec.rb b/spec/wasabi/integration/juniper_spec.rb
similarity index 70%
rename from spec/wasabi/parser/juniper_spec.rb
rename to spec/wasabi/integration/juniper_spec.rb
index 4be7caa..d0708aa 100644
--- a/spec/wasabi/parser/juniper_spec.rb
+++ b/spec/wasabi/integration/juniper_spec.rb
@@ -1,14 +1,14 @@
 require "spec_helper"
 
-describe Wasabi::Parser do
+describe Wasabi do
   context 'with: juniper.wsdl' do
 
-    subject(:parser) { Wasabi::Parser.new Nokogiri::XML(xml) }
+    subject(:wsdl) { Wasabi.new(xml) }
 
     let(:xml) { fixture(:juniper).read }
 
     it 'does not blow up when an extension base element is defined in an import' do
-      operation = parser.operations[:get_system_info_request]
+      operation = wsdl.documents.operations[:get_system_info_request]
 
       operation.input.should == 'GetSystemInfoRequest'
       operation.soap_action.should == 'urn:#GetSystemInfoRequest'
diff --git a/spec/wasabi/parser/no_message_parts_spec.rb b/spec/wasabi/integration/no_message_parts_spec.rb
similarity index 58%
rename from spec/wasabi/parser/no_message_parts_spec.rb
rename to spec/wasabi/integration/no_message_parts_spec.rb
index 2f13ddc..54f2772 100644
--- a/spec/wasabi/parser/no_message_parts_spec.rb
+++ b/spec/wasabi/integration/no_message_parts_spec.rb
@@ -1,18 +1,18 @@
 require "spec_helper"
 
-describe Wasabi::Parser do
+describe Wasabi do
   context "with: no_message_parts.wsdl" do
 
-    subject(:parser) { Wasabi::Parser.new Nokogiri::XML(xml) }
+    subject(:wsdl) { Wasabi.new(xml) }
 
     let(:xml) { fixture(:no_message_parts).read }
 
     it "falls back to using the message type in the port element" do
-      parser.operations[:save].input.should == "Save"
+      wsdl.documents.operations[:save].input.should == "Save"
     end
 
     it "falls back to using the namespace ID in the port element" do
-      parser.operations[:save].nsid.should == "actions"
+      wsdl.documents.operations[:save].nsid.should == "actions"
     end
   end
 end
diff --git a/spec/wasabi/parser/symbolic_endpoint_spec.rb b/spec/wasabi/integration/symbolic_endpoint_spec.rb
similarity index 58%
rename from spec/wasabi/parser/symbolic_endpoint_spec.rb
rename to spec/wasabi/integration/symbolic_endpoint_spec.rb
index 0096c7a..c943cf8 100644
--- a/spec/wasabi/parser/symbolic_endpoint_spec.rb
+++ b/spec/wasabi/integration/symbolic_endpoint_spec.rb
@@ -1,14 +1,14 @@
 require "spec_helper"
 
-describe Wasabi::Parser do
+describe Wasabi do
   context "with: symbolic_endpoint.wsdl" do
 
-    subject(:parser) { Wasabi::Parser.new Nokogiri::XML(xml) }
+    subject(:wsdl) { Wasabi.new(xml) }
 
     let(:xml) { fixture(:symbolic_endpoint).read }
 
     it "allows symbolic endpoints" do
-      parser.endpoint.should be_nil
+      wsdl.endpoint.should be_nil
     end
 
   end
diff --git a/spec/wasabi/parser/import_port_types_spec.rb b/spec/wasabi/parser/import_port_types_spec.rb
deleted file mode 100644
index 9063621..0000000
--- a/spec/wasabi/parser/import_port_types_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require "spec_helper"
-
-describe Wasabi::Parser do
-  context "with: import_port_types.wsdl" do
-
-    subject(:parser) { Wasabi::Parser.new Nokogiri::XML(xml) }
-
-    let(:xml) { fixture(:import_port_types).read }
-
-    it "does blow up when portTypes are imported" do
-      operation = parser.operations[:get_customer]
-
-      operation.input.should == "GetCustomer"
-      operation.nsid.should be_nil
-    end
-
-  end
-end
diff --git a/spec/wasabi/parser/no_target_namespace_spec.rb b/spec/wasabi/parser/no_target_namespace_spec.rb
deleted file mode 100644
index f38083b..0000000
--- a/spec/wasabi/parser/no_target_namespace_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require "spec_helper"
-
-describe Wasabi::Parser do
-  context "with a WSDL defining xs:schema without targetNamespace" do
-
-    subject do
-      parser = Wasabi::Parser.new Nokogiri::XML(xml)
-      parser.parse
-      parser
-    end
-
-    let(:xml) do
-      %Q{
-        <definitions xmlns='http://schemas.xmlsoap.org/wsdl/'
-          xmlns:xs='http://www.w3.org/2001/XMLSchema'
-          targetNamespace='http://def.example.com'>
-          <types>
-            <xs:schema elementFormDefault='qualified'>
-              <xs:element name='Save'>
-                <xs:complexType></xs:complexType>
-              </xs:element>
-            </xs:schema>
-          </types>
-        </definitions>
-      }
-    end
-
-    # Don't know if real WSDL files omit targetNamespace from xs:schema,
-    # but I suppose we should do something reasonable if they do.
-
-    it "defaults to the target namespace from xs:definitions" do
-      pending "find out if this meets the specification"
-      subject.schemas.types["Save"].namespace.should == "http://def.example.com"
-    end
-
-  end
-end
diff --git a/spec/wasabi/resolver_spec.rb b/spec/wasabi/resolver_spec.rb
index b96e82a..1259c04 100644
--- a/spec/wasabi/resolver_spec.rb
+++ b/spec/wasabi/resolver_spec.rb
@@ -4,7 +4,7 @@
 
   describe "#resolve" do
     it "resolves remote documents" do
-      HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
+      HTTPI.expects(:get).returns HTTPI::Response.new(200, {}, "wsdl")
       xml = Wasabi::Resolver.new.resolve("http://example.com?wsdl")
       xml.should == "wsdl"
     end
@@ -25,14 +25,14 @@
         "content-type" => "text/html"
       }
       body = "<html><head><title>404 Not Found</title></head><body>Oops!</body></html>"
+
       failed_response = HTTPI::Response.new(code, headers, body)
-      HTTPI.stub(:get => failed_response)
-      lambda do
-        Wasabi::Resolver.new.resolve("http://example.com?wsdl")
-      end.should raise_error { |ex|
-        ex.should be_a(Wasabi::Resolver::HTTPError)
-        ex.message.should == "Error: #{code}"
-        ex.response.should == failed_response
+      HTTPI.stubs(:get).returns(failed_response)
+
+      expect { Wasabi::Resolver.new.resolve("http://example.com?wsdl") }.to raise_error { |error|
+        error.should be_a(Wasabi::Resolver::HTTPError)
+        error.message.should == "Error: #{code}"
+        error.response.should == failed_response
       }
     end
   end
diff --git a/spec/wasabi/types_spec.rb b/spec/wasabi/types_spec.rb
index 49c43c8..7a944bb 100644
--- a/spec/wasabi/types_spec.rb
+++ b/spec/wasabi/types_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Wasabi::Parser do
+describe Wasabi do
 
   it 'knows simple types' do
-    parser = parse('
+    wsdl = wsdl('
       <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:ActionWebService">
         <xs:simpleType name="TemperatureUnit">
           <xs:restriction base="xs:string">
@@ -17,14 +17,14 @@
       </xs:schema>
     ')
 
-    unit = parser.schemas.simple_type('TemperatureUnit')
+    unit = wsdl.schemas.simple_type('TemperatureUnit')
 
     expect(unit).to be_a(Wasabi::SimpleType)
     expect(unit.type).to eq('xs:string')
   end
 
   it 'knows xs:all types' do
-    parser = parse('
+    wsdl = wsdl('
       <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:ActionWebService">
         <xs:complexType name="MpUser">
           <xs:all>
@@ -41,7 +41,7 @@
       </xs:schema>
     ')
 
-    mp_user = parser.schemas.complex_type('MpUser')
+    mp_user = wsdl.schemas.complex_type('MpUser')
 
     expect(mp_user).to be_a(Wasabi::Type)
     expect(mp_user).to have(8).children
@@ -55,7 +55,7 @@
   end
 
   it 'works with multiple schemas and extensions' do
-    parser = parse('
+    wsdl = wsdl('
 		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://object.api.example.com/"
             attributeFormDefault="qualified" elementFormDefault="qualified">
 			<complexType name="Account">
@@ -94,7 +94,7 @@
     </schema>
     ')
 
-    account = parser.schemas.complex_type('Account')
+    account = wsdl.schemas.complex_type('Account')
 
     expect(account).to be_a(Wasabi::Type)
     expect(account).to have(5).children
@@ -110,7 +110,7 @@
   end
 
   it 'determines whether elements are simple types by their namespace' do
-    parser = parse('
+    wsdl = wsdl('
       <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:ActionWebService">
         <xs:element name="TermOfPayment">
           <xs:complexType>
@@ -123,7 +123,7 @@
       </xs:schema>
     ')
 
-    terms = parser.schemas.element('TermOfPayment')
+    terms = wsdl.schemas.element('TermOfPayment')
 
     expect(terms).to be_a(Wasabi::Type)
     expect(terms).to have(2).children
@@ -146,7 +146,7 @@
     ])
   end
 
-  def parse(types)
+  def wsdl(types)
     wsdl = %'<definitions name="Api" targetNamespace="urn:ActionWebService"
                  xmlns="http://schemas.xmlsoap.org/wsdl/"
                  xmlns:tns="urn:ActionWebService"
@@ -158,7 +158,7 @@ def parse(types)
                </types>
              </definitions>'
 
-    Wasabi::Parser.new Nokogiri.XML(wsdl)
+    Wasabi.new(wsdl)
   end
 
 end
diff --git a/wasabi.gemspec b/wasabi.gemspec
index 274b431..1999a29 100644
--- a/wasabi.gemspec
+++ b/wasabi.gemspec
@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.add_dependency "httpi",    "~> 2.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
 
-  s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.10"
+  s.add_development_dependency "rake",  "~> 10.0"
+  s.add_development_dependency "rspec", "~> 2.13"
+  s.add_development_dependency "mocha", "~> 0.13"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")