plan_executor 1.0.2 → 1.8.0

data/lib/daf_resource_generator.rb

@@ -6,7 +6,7 @@ module Crucible
         resource = minimal_patient(identifier,name)
         # resource.identifier = [ minimal_identifier(identifier) ]
         # resource.name = [ minimal_humanname(name) ]
-        resource.meta = FHIR::Resource::ResourceMetaComponent.new
+        resource.meta = FHIR::Meta.new
         resource.meta.profile = ['http://hl7.org/fhir/StructureDefinition/daf-patient']
         # DAF must supports and DAF extensions
         resource.active = true
@@ -15,12 +15,12 @@ module Crucible
         resource.birthDate = DateTime.now.strftime("%Y-%m-%d")
         resource.deceasedBoolean = false
         resource.address = [ daf_address ]
-        resource.maritalStatus = minimal_codeableconcept('http://hl7.org/fhir/marital-status','S')
+        resource.maritalStatus = minimal_codeableconcept('http://hl7.org/fhir/v3/MaritalStatus','S')
         resource.multipleBirthBoolean = false
         resource.contact = [ daf_patient_contact ]
         resource.communication = [ daf_patient_communication ]
-        resource.careProvider = [ FHIR::Reference.new ] # reference to DAF-Organization or DAF-Pract
-        resource.careProvider.first.display = 'DAF Organization or Practitioner'
+        # resource.careProvider = [ FHIR::Reference.new ] # reference to DAF-Organization or DAF-Pract
+        # resource.careProvider.first.display = 'DAF Organization or Practitioner'
         resource.managingOrganization = FHIR::Reference.new # reference to DAF-Organization
         resource.managingOrganization.display = 'DAF Organization'
         resource.extension = []
@@ -68,7 +68,7 @@ module Crucible
       end
 
       def self.daf_patient_contact
-        resource = FHIR::Patient::ContactComponent.new
+        resource = FHIR::Patient::Contact.new
         resource.relationship = [ minimal_codeableconcept('http://hl7.org/fhir/patient-contact-relationship','parent'), minimal_codeableconcept('http://hl7.org/fhir/patient-contact-relationship','emergency') ]
         resource.name = minimal_humanname('Mom')
         resource.telecom = [ daf_contact_point ]
@@ -77,7 +77,7 @@ module Crucible
       end
 
       def self.daf_patient_communication
-        resource = FHIR::Patient::PatientCommunicationComponent.new
+        resource = FHIR::Patient::Communication.new
         resource.language = minimal_codeableconcept('http://tools.ietf.org/html/bcp47','en-US')
         resource
       end
@@ -85,7 +85,7 @@ module Crucible
       def self.make_extension(url,type,value)
         extension = FHIR::Extension.new
         extension.url = url
-        extension.value = FHIR::AnyType.new(type,value)
+        extension.method("value#{type}=".to_sym).call(value)
         extension
       end
 

data/lib/data/resources.rb

@@ -14,67 +14,63 @@ module Crucible
       end
 
       def example_patient
-        FHIR::Patient.from_xml File.read(File.join(fixture_path, 'patient', 'patient-example.xml'))
-      end
-
-      def example_format_patient
-        FHIR::Patient.from_xml File.read(File.join(fixture_path, 'patient', 'patient-format-example.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'patient', 'patient-example.xml'))
       end
 
       def example_patient_us
-        FHIR::Patient.from_xml File.read(File.join(fixture_path, 'patient', 'patient-example-us-extensions(us01).xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'patient', 'patient-example-us-extensions.xml'))
       end
 
       def minimal_patient
-        FHIR::Patient.from_xml File.read(File.join(fixture_path, 'patient', 'patient-minimal.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'patient', 'patient-minimal.xml'))
       end
 
       def example_patient_record_201
-        FHIR::Patient.from_xml File.read(File.join(fixture_path, 'record', 'patient-example-f201-roel.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'patient-example-f201-roel.xml'))
       end
 
       def example_patient_record_condition_201
-        FHIR::Condition.from_xml File.read(File.join(fixture_path, 'record', 'condition-example-f201-fever.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'condition-example-f201-fever.xml'))
       end
 
       def example_patient_record_condition_205
-        FHIR::Condition.from_xml File.read(File.join(fixture_path, 'record', 'condition-example-f205-infection.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'condition-example-f205-infection.xml'))
       end
 
       def example_patient_record_diagnosticreport_201
-        FHIR::DiagnosticReport.from_xml File.read(File.join(fixture_path, 'record', 'diagnosticreport-example-f201-brainct.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'diagnosticreport-example-f201-brainct.xml'))
       end
 
       def example_patient_record_encounter_201
-        FHIR::Encounter.from_xml File.read(File.join(fixture_path, 'record', 'encounter-example-f201-20130404.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'encounter-example-f201-20130404.xml'))
       end
 
       def example_patient_record_encounter_202
-        FHIR::Encounter.from_xml File.read(File.join(fixture_path, 'record', 'encounter-example-f202-20130128.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'encounter-example-f202-20130128.xml'))
       end
 
       def example_patient_record_observation_202
-        FHIR::Observation.from_xml File.read(File.join(fixture_path, 'record', 'observation-example-f202-temperature.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'observation-example-f202-temperature.xml'))
       end
 
       def example_patient_record_organization_201
-        FHIR::Organization.from_xml File.read(File.join(fixture_path, 'record', 'organization-example-f201-aumc.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'organization-example-f201-aumc.xml'))
       end
 
       def example_patient_record_organization_203
-        FHIR::Organization.from_xml File.read(File.join(fixture_path, 'record', 'organization-example-f203-bumc.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'organization-example-f203-bumc.xml'))
       end
 
       def example_patient_record_practitioner_201
-        FHIR::Practitioner.from_xml File.read(File.join(fixture_path, 'record', 'practitioner-example-f201-ab.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'practitioner-example-f201-ab.xml'))
       end
 
       def example_patient_record_procedure_201
-        FHIR::Procedure.from_xml File.read(File.join(fixture_path, 'record', 'procedure-example-f201-tpf.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'record', 'procedure-example-f201-tpf.xml'))
       end
 
       def track3_profile
-        FHIR::StructureDefinition.from_xml File.read(File.join(fixture_path, 'validation', 'observation.profile.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'validation', 'observation.profile.xml'))
       end
 
       def track3_observations
@@ -82,7 +78,7 @@ module Crucible
         observations = []
         files = File.join(fixture_path, 'validation', 'observations', '*.xml')
         Dir.glob(files).each do |f|
-            observations << FHIR::Observation.from_xml( File.read(f) )
+            observations << FHIR::Xml.from_xml( File.read(f) )
         end
         observations
       end
@@ -90,47 +86,71 @@ module Crucible
       # ------------------------------ CLAIM TEST TRACK ------------------------------
 
       def simple_claim
-        FHIR::Claim.from_xml File.read(File.join(fixture_path, 'financial', 'claim-example-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'financial', 'claim-example.xml'))
       end
 
       def average_claim
-        FHIR::Claim.from_xml File.read(File.join(fixture_path, 'financial', 'claim-example-average.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'financial', 'claim-example-oral-average.xml'))
+      end
+
+      def complex_claim
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'financial', 'claim-example-oral-orthoplan.xml'))
       end
 
       # ------------------------------ SCHEDULING TEST TRACK ------------------------------
 
       def scheduling_appointment
-        FHIR::Appointment.from_xml File.read(File.join(fixture_path, 'scheduling', 'appointment-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'scheduling', 'appointment-simple.xml'))
       end
 
       def scheduling_response_patient
-        FHIR::AppointmentResponse.from_xml File.read(File.join(fixture_path, 'scheduling', 'appointmentresponse-patient-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'scheduling', 'appointmentresponse-patient-simple.xml'))
       end
 
       def scheduling_response_practitioner
-        FHIR::AppointmentResponse.from_xml File.read(File.join(fixture_path, 'scheduling', 'appointmentresponse-practitioner-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'scheduling', 'appointmentresponse-practitioner-simple.xml'))
       end
 
       def scheduling_practitioner
-        FHIR::Practitioner.from_xml File.read(File.join(fixture_path, 'scheduling', 'practitioner-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'scheduling', 'practitioner-simple.xml'))
       end
 
       def scheduling_schedule
-        FHIR::Schedule.from_xml File.read(File.join(fixture_path, 'scheduling', 'schedule-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'scheduling', 'schedule-simple.xml'))
       end
 
       def scheduling_slot
-        FHIR::Slot.from_xml File.read(File.join(fixture_path, 'scheduling', 'slot-simple.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'scheduling', 'slot-simple.xml'))
       end
 
       # ------------------------------ DAF TESTS ------------------------------
 
       def daf_conformance
-        FHIR::Conformance.from_xml File.read(File.join(fixture_path, 'daf', 'conformance-daf-query-responder.xml'))
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'daf', 'conformance-daf-query-responder.xml'))
+      end
+
+      # ------------------------------ TERMINOLOGY TRACK TESTS ------------------------------
+
+      def codesystem_simple
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'terminology', 'codesystem-simple.xml'))
+      end
+
+      def valueset_simple
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'terminology', 'valueset-example.xml'))
+      end
+
+      def conceptmap_simple
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'terminology', 'conceptmap-example.xml'))
+      end
+
+      # ------------------------------ PATCH TRACK TESTS ------------------------------
+
+      def medicationorder_simple
+        FHIR::Xml.from_xml File.read(File.join(fixture_path, 'patch', 'medicationrequest-simple.xml'))
       end
 
       def load_fixture(path)
-        FHIR::Resource.from_contents(File.read(File.join(fixture_path, path)))
+        FHIR.from_contents(File.read(File.join(fixture_path, path)))
       end
 
     end

data/lib/ext/client.rb

@@ -12,7 +12,7 @@ module FHIR
     def monitor_requests
       return if @decorated
       @decorated = true
-      [:get, :put, :post, :delete, :head].each do |method|
+      [:get, :put, :post, :delete, :head, :patch].each do |method|
         class_eval %Q{
           alias #{method}_original #{method}
           def #{method}(*args, &block)
@@ -24,4 +24,4 @@ module FHIR
       end
     end
   end
-end
+end

data/lib/plan_executor.rb

@@ -1,11 +1,16 @@
+# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
 # Top level include file that brings in all the necessary code
 require 'bundler/setup'
 require 'rubygems'
 require 'yaml'
 require 'nokogiri'
-require 'fhir_model'
+require 'logger'
 require 'fhir_client'
 require 'nokogiri/diff'
+require 'active_support/inflector'
+require 'active_support/core_ext'
+require 'jsonpath'
 
 require_relative File.join('.','executor.rb')
 require_relative File.join('.','test_result.rb')

data/lib/resource_generator.rb

@@ -10,14 +10,11 @@ module Crucible
       def self.generate(klass,embedded=0)
         resource = klass.new
         Time.zone = 'UTC'
-        set_fields!(resource)
-        if(embedded > 0)
-          generate_children!(resource,embedded)
-        end
-        resource.xmlId=nil if resource.respond_to?(:xmlId=)
+        set_fields!(resource, embedded)
+        resource.id=nil if resource.respond_to?(:id=)
         resource.versionId=nil if resource.respond_to?(:versionId=)
         resource.version=nil if resource.respond_to?(:version=)
-        resource.text=nil if [FHIR::Bundle,FHIR::Binary,FHIR::Parameters].include?(klass)
+        #resource.text=nil if [FHIR::Bundle,FHIR::Binary].include?(klass)
         apply_invariants!(resource)
         resource
       end
@@ -25,136 +22,131 @@ module Crucible
       #
       # Set the fields of this resource to have some random values.
       #
-      def self.set_fields!(resource)
-        # Organize some of the validators
-        validators = {}
-        resource.class.validators.collect{|v| v if v.class==Mongoid::Validatable::FormatValidator}.compact.each do |v|
-          v.attributes.each{|a| validators[a] = v.options[:with]}
-        end
+      def self.set_fields!(resource, embedded=0)
 
-        # For now, we'll skip fields that can have multiple datatypes, such as attribute[x]
-        multiples = []
+        unselected_multiples = []
         if resource.class.constants.include? :MULTIPLE_TYPES
-          multiples = resource.class::MULTIPLE_TYPES.map{|k,v| v}.flatten
+          multiples = resource.class::MULTIPLE_TYPES.keys
+          all_multiples = multiples.map{|k| resource.class::MULTIPLE_TYPES[k].map{|d| "#{k}#{d.titleize.split.join}" }}.flatten
+          selected_multiples = multiples.map{|k| "#{k}#{resource.class::MULTIPLE_TYPES[k].sample.titleize.split.join}" }
+          unselected_multiples = all_multiples - selected_multiples
         end
-
-        # Get valid codes
-        valid_codes = {}
-        if resource.class.constants.include? :VALID_CODES
-          valid_codes = resource.class::VALID_CODES
+        unselected_multiples.each do |key|
+          resource.method("#{key}=").call(nil)
         end
 
-        # Get special codes
-        special_codes = {}
-        if resource.class.constants.include? :SPECIAL_CODES
-          special_codes = resource.class::SPECIAL_CODES
-        end
+        resource.class::METADATA.each do |key, meta|
+          type = meta['type']
+          next if type == 'Meta'
+		      next if ['id','contained','version','versionId','implicitRules'].include? key
+          next if unselected_multiples.include?(key)
 
-        fields = resource.fields
-        fields.each do |key,value|
-          type = value.options[:type]
-		      next if ['id','xmlId','version','versionId','implicitRules'].include? key
-          next if multiples.include? key
           gen = nil
-          if type == String
+          if type == 'string' || type == 'markdown'
             gen = SecureRandom.base64
-            if valid_codes[key.to_sym]
-              valid_values = valid_codes[key.to_sym]
-              if !valid_values.nil?
-                gen = valid_values[ SecureRandom.random_number( valid_values.length ) ]
-              end
-            elsif validators[key.to_sym]
-              date = DateTime.now
-              regex = validators[key.to_sym]
-              if date.strftime("%Y-%m-%dT%T.%LZ").match(regex)
-                gen = date.strftime("%Y-%m-%dT%T.%LZ")
-              elsif date.strftime("%Y-%m-%d").match(regex)
-                gen = date.strftime("%Y-%m-%d")
-              elsif date.strftime("%T").match(regex)
-                gen = date.strftime("%T")
-              end
-            elsif special_codes[key.to_sym]
-              if special_codes[key.to_sym]=='MimeType'
-                gen = 'text/plain'
-              elsif special_codes[key.to_sym]=='Language'
-                gen = 'en-US'
-              end
+          elsif type == 'oid'
+            gen = random_oid
+          elsif type == 'id'
+            gen = SecureRandom.uuid
+          elsif type == 'code'
+            if meta['valid_codes']
+              gen = meta['valid_codes'].values.first.sample
+            elsif meta['binding'] && ['http://tools.ietf.org/html/bcp47','http://hl7.org/fhir/ValueSet/languages'].include?(meta['binding']['uri'])
+              gen = 'en-US'
+            elsif meta['binding'] && ['http://www.rfc-editor.org/bcp/bcp13.txt','http://hl7.org/fhir/ValueSet/content-type'].include?(meta['binding']['uri'])
+              gen = MIME::Types.to_a.sample.content_type
+            else
+              gen = SecureRandom.base64
             end
-          elsif type == Integer
-            gen = (SecureRandom.random_number(100) + 1) # add one in case this is a "positiveInt" which must be > 0
-          elsif type == Float
+          elsif type == 'xhtml'
+            gen = "<div>#{SecureRandom.base64}</div>"
+          elsif type == 'uri'
+            gen = "http://projectcrucible.org/#{SecureRandom.base64}"
+          elsif type == 'dateTime' || type == 'instant'
+            gen = DateTime.now.strftime("%Y-%m-%dT%T.%LZ")
+          elsif type == 'date'
+            gen = DateTime.now.strftime("%Y-%m-%d")
+          elsif type == 'time'
+            gen = DateTime.now.strftime("%T")
+          elsif type == 'boolean'
+            gen = (SecureRandom.random_number(100) % 2 == 0)
+          elsif type == 'positiveInt' || type == 'unsignedInt' || type == 'integer'
+             gen = (SecureRandom.random_number(100) + 1) # add one in case this is a "positiveInt" which must be > 0
+          elsif type == 'decimal'
             gen = SecureRandom.random_number
             while gen.to_s.match(/e/) # according to FHIR spec: decimals may not contain exponents
               gen = SecureRandom.random_number
             end
-          elsif type == Mongoid::Boolean
-            gen = (SecureRandom.random_number(100) % 2 == 0)
-          elsif type == BSON::Binary
-            # gen = SecureRandom.random_bytes
+          elsif type == 'base64Binary'
             gen = SecureRandom.base64
-          elsif type == BSON::ObjectId or type == Array or type == Object or type == FHIR::AnyType
-            gen = nil # ignore
-          # else
-          #   puts "Unable to generate field #{key} for #{resource.class} -- unrecognized type: #{type}"
+          elsif FHIR::RESOURCES.include?(type)
+            if embedded > 0
+              gen = generate_child(type, embedded-1)
+            end
+          elsif FHIR::TYPES.include?(type)
+            if embedded > 0
+              gen = generate_child(type, embedded-1)
+              # apply bindings
+              if type == 'CodeableConcept' && meta['valid_codes'] && meta['binding']
+                gen.coding.each do |c|
+                  c.system = meta['valid_codes'].keys.sample
+                  c.code = meta['valid_codes'][c.system].sample
+                  display = FHIR::Definitions.get_display(c.system, c.code)
+                  c.display = display ? display : nil
+                end
+              elsif type == 'CodeableConcept' && meta['binding'] && meta['binding']['uri'] == 'http://hl7.org/fhir/ValueSet/use-context'
+                gen.coding.each do |c|
+                  c.system = 'https://www.usps.com/'
+                  c.code = ['CA','TX','NY','MA','DC'].sample
+                end
+              elsif type == 'Coding' && meta['valid_codes'] && meta['binding']
+                gen.system = meta['valid_codes'].keys.sample
+                gen.code = meta['valid_codes'][gen.system].sample
+                display = FHIR::Definitions.get_display(gen.system, gen.code)
+                gen.display = display ? display : nil
+              elsif type == 'Reference'
+                gen.reference = nil
+                gen.display = "#{meta['type_profiles'].map{|x|x.split('/').last}.sample} #{gen.display}" if meta['type_profiles']
+              elsif type == 'Attachment'
+                gen.contentType = MIME::Types.to_a.sample.content_type
+                gen.data = nil
+              elsif type == 'Narrative'
+                gen.status = 'generated'
+              end
+            end
+          elsif resource.class.constants.include? type.demodulize.to_sym
+            if embedded > 0
+              # CHILD component
+              gen = generate_child(type, embedded-1)
+            end
+          elsif ancestor_fhir_classes(resource.class).include? type.demodulize.to_sym
+            if embedded > 0
+              gen = generate_child(type, embedded-1)
+            end
+          elsif ("FHIR::#{type}".constantize rescue nil)
+            if embedded > 0
+              gen = generate_child(type, embedded-1)
+            end
+          else
+            puts "Unable to generate field #{key} for #{resource.class} -- unrecognized type: #{type}"
           end
-          gen='en-US' if(key=='language' && type==String)
-          resource[key] = gen if !gen.nil?
+          method = meta['local_name'] ? meta['local_name'] : key
+          gen = [gen] if meta['max'] > 1 && !gen.nil?
+          resource.method("#{method}=").call(gen) if !gen.nil?
         end
         resource
       end
 
+      def self.ancestor_fhir_classes(klass)
+        classes = klass.constants
+        classes.concat ancestor_fhir_classes(klass.parent) if klass.parent != FHIR && klass.parent != Object
+        classes
+      end
 
-      #
-      # Generate children for this resource.
-      #
-      def self.generate_children!(resource,embedded=0)
-        # For now, we'll skip fields that can have multiple datatypes, such as attribute[x]
-        multiples = []
-        if resource.class.constants.include? :MULTIPLE_TYPES
-          multiples = resource.class::MULTIPLE_TYPES.map{|k,v| v}.flatten
-        end
-
-        children = resource.embedded_relations
-        children.each do |key,value|
-          # TODO: Determine if we can generate references or meta information
-          next if ['meta'].include? key
-          next if multiples.include? key
-          
-          klass = resource.get_fhir_class_from_resource_type(value[:class_name])
-          case klass
-          when FHIR::Reference
-            child = FHIR::Reference.new
-            child.display = "#{key} #{SecureRandom.base64}"
-          when FHIR::CodeableConcept
-            child = FHIR::CodeableConcept.new
-            child.text = "#{key} #{SecureRandom.base64}"
-          when FHIR::Coding
-            child = FHIR::Coding.new
-            child.display = "#{key} #{SecureRandom.base64}"
-          when FHIR::Quantity
-            child = FHIR::Quantity.new
-            child.value = SecureRandom.random_number
-            while child.value.to_s.match(/e/) # according to FHIR spec: decimals may not contain exponents
-              child.value = SecureRandom.random_number
-            end
-            child.unit = SecureRandom.base64
-          else
-            child = generate(klass,(embedded-1)) if(!['FHIR::Extension','FHIR::PrimitiveExtension','FHIR::Signature'].include?(value[:class_name]))
-          end
-
-          case klass
-          when FHIR::Identifier
-            child.system = nil
-          when FHIR::Attachment
-            child.url = nil
-          end
-
-          if value[:relation] == Mongoid::Relations::Embedded::Many
-            child = ([] << child) if child
-          end
-          resource[key] = child if child
-        end
-        resource
+      def self.generate_child(type, embedded=0)
+        return if ['Meta','Extension','PrimitiveExtension'].include? type
+        klass = "FHIR::#{type}".constantize
+        generate(klass, embedded)
       end
 
       def self.random_oid
@@ -193,11 +185,11 @@ module Crucible
       # Default system/code are for SNOMED "Obese (finding)"
       def self.minimal_condition(system='http://snomed.info/sct',code='414915002',patientId=nil)
         resource = FHIR::Condition.new
-        resource.patient = FHIR::Reference.new
+        resource.subject = FHIR::Reference.new
         if patientId
-          resource.patient.reference = "Patient/#{patientId}"
+          resource.subject.reference = "Patient/#{patientId}"
         else
-          resource.patient.display = 'Patient'
+          resource.subject.display = 'Patient'
         end
         resource.code = minimal_codeableconcept(system,code)
         resource.verificationStatus = 'confirmed'
@@ -215,9 +207,9 @@ module Crucible
       def self.minimal_humanname(name='Name')
         hn = FHIR::HumanName.new
         hn.use = 'official'
-        hn.family = [ 'Crucible' ]
+        hn.family = 'Crucible'
         hn.given = [ name ]
-        hn.text = "#{hn.given[0]} #{hn.family[0]}"
+        hn.text = "#{hn.given[0]} #{hn.family}"
         hn
       end
 
@@ -263,7 +255,7 @@ module Crucible
       end
 
       def self.minimal_animal
-        animal = FHIR::Patient::AnimalComponent.new
+        animal = FHIR::Patient::Animal.new
         animal.species = minimal_codeableconcept('http://hl7.org/fhir/animal-species','canislf') # dog
         animal.breed = minimal_codeableconcept('http://hl7.org/fhir/animal-breed','gret') # golden retriever
         animal.genderStatus = minimal_codeableconcept('http://hl7.org/fhir/animal-genderstatus','intact') # intact
@@ -271,71 +263,102 @@ module Crucible
       end
 
       def self.apply_invariants!(resource)
-        case resource.class
+        case resource
+        when FHIR::Age 
+          resource.system = 'http://unitsofmeasure.org'
+          resource.code = 'a'
+          resource.value = (SecureRandom.random_number(100) + 1)
+          resource.unit = nil
+          resource.comparator = nil
+        when FHIR::AllergyIntolerance
+          resource.clinicalStatus = nil if resource.verificationStatus=='entered-in-error'
+        when FHIR::Duration 
+          resource.system = 'http://unitsofmeasure.org'
+          resource.code = 'mo'
+          resource.unit = nil
+          resource.comparator = nil
+        when FHIR::Money 
+          resource.system = 'urn:iso:std:iso:4217'
+          resource.code = 'USD'
+          resource.unit = nil
+          resource.comparator = nil 
         when FHIR::Appointment
           resource.reason = minimal_codeableconcept('http://snomed.info/sct','219006') # drinker of alcohol
-          resource.participant.each{|p| p.fhirType=[ minimal_codeableconcept('http://hl7.org/fhir/participant-type','emergency') ] }
+          resource.participant.each{|p| p.type=[ minimal_codeableconcept('http://hl7.org/fhir/participant-type','emergency') ] }
         when FHIR::AppointmentResponse
           resource.participantType = [ minimal_codeableconcept('http://hl7.org/fhir/participant-type','emergency') ]
         when FHIR::AuditEvent
-          resource.object.each do |o|
+          resource.entity.each do |o|
             o.query=nil
             o.name = "name #{SecureRandom.base64}" if o.name.nil?
           end
         when FHIR::Bundle
-          resource.total = nil if !['searchset','history'].include?(resource.fhirType)
-          resource.entry.each {|e|e.search=nil} if resource.fhirType!='searchset'
-          resource.entry.each {|e|e.request=nil} if !['batch','transaction','history'].include?(resource.fhirType)
-          resource.entry.each {|e|e.response=nil} if !['batch-response','transaction-response'].include?(resource.fhirType)
+          resource.type = ['document','message','collection'].sample
+          resource.total = nil if !['searchset','history'].include?(resource.type)
+          resource.entry.each {|e|e.search=nil} if resource.type!='searchset'
+          resource.entry.each {|e|e.request=nil} if !['batch','transaction','history'].include?(resource.type)
+          resource.entry.each {|e|e.response=nil} if !['batch-response','transaction-response'].include?(resource.type)
           head = resource.entry.first
           if !head.nil?
-            if head.request.nil? && head.response.nil? && head.resource.nil?
-              if resource.fhirType == 'document'
-                head.resource = generate(FHIR::Composition,3)
-              elsif resource.fhirType == 'message'
-                head.resource = generate(FHIR::MessageHeader,3)  
-              else
-                head.resource = generate(FHIR::Basic,3)                              
-              end
-            end
-            if head.resource.nil?
-              head.fullUrl = nil
+            if resource.type == 'document'
+              head.resource = generate(FHIR::Composition,3)
+            elsif resource.type == 'message'
+              head.resource = generate(FHIR::MessageHeader,3)  
             else
-              rid = SecureRandom.random_number(100) + 1
-              head.fullUrl = "http://projectcrucible.org/fhir/#{rid}"
-              head.resource.xmlId = "#{rid}"
+              head.resource = generate(FHIR::Basic,3)                              
             end
+            rid = SecureRandom.random_number(100) + 1
+            head.fullUrl = "http://projectcrucible.org/fhir/#{head.resource.resourceType}/#{rid}"
+            head.resource.id = "#{rid}"
           end
         when FHIR::CarePlan
           resource.activity.each {|a| a.reference = nil if a.detail }
+        when FHIR::CodeSystem
+          resource.concept.each do |c|
+            c.concept.each do |d|
+              d.property.each do |p|
+                p.valueCode = nil
+                p.valueCoding = nil
+                p.valueString = SecureRandom.base64
+                p.valueInteger = nil
+                p.valueBoolean = nil
+                p.valueDateTime = nil
+              end
+            end
+          end
+        when FHIR::CapabilityStatement
+          resource.kind = 'instance'
+          resource.rest.each do |r|
+            r.resource.each do |res|
+              res.interaction.each{|i|i.code = ['read', 'vread', 'update', 'delete', 'history-instance', 'history-type', 'create', 'search-type'].sample}
+            end
+            r.interaction.each{|i|i.code = ['transaction', 'batch', 'search-system', 'history-system'].sample }
+          end
         when FHIR::Claim
           resource.item.each do |item|
-            item.fhirType = minimal_coding('http://hl7.org/fhir/v3/ActCode','OHSINV')
+            item.category = minimal_coding('http://hl7.org/fhir/v3/ActCode','OHSINV')
             item.detail.each do |detail|
-              detail.fhirType = minimal_coding('http://hl7.org/fhir/v3/ActCode','OHSINV')
+              detail.category = minimal_coding('http://hl7.org/fhir/v3/ActCode','OHSINV')
               detail.subDetail.each do |sub|
-                sub.fhirType = minimal_coding('http://hl7.org/fhir/v3/ActCode','OHSINV')
+                sub.category = minimal_coding('http://hl7.org/fhir/v3/ActCode','OHSINV')
                 sub.service = minimal_coding('http://hl7.org/fhir/ex-USCLS','1205')
               end
             end
           end
-          resource.missingTeeth.each do |mt|
-            mt.tooth = minimal_coding('http://hl7.org/fhir/ex-fdi','42')
-          end
         when FHIR::ClaimResponse
           resource.item.each do |item|
-            item.adjudication.each{|a|a.code = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
+            item.adjudication.each{|a|a.category = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
             item.detail.each do |detail|
-              detail.adjudication.each{|a|a.code = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
+              detail.adjudication.each{|a|a.category = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
               detail.subDetail.each do |sub|
-                sub.adjudication.each{|a|a.code = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
+                sub.adjudication.each{|a|a.category = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
               end
             end
           end
           resource.addItem.each do |addItem|
-            addItem.adjudication.each{|a|a.code = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
+            addItem.adjudication.each{|a|a.category = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
             addItem.detail.each do |detail|
-              detail.adjudication.each{|a|a.code = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
+              detail.adjudication.each{|a|a.category = minimal_coding('http://hl7.org/fhir/adjudication','benefit')}
             end
           end
         when FHIR::Communication
@@ -358,8 +381,28 @@ module Crucible
           if(resource.targetUri.nil? && resource.targetReference.nil?)
             resource.targetReference = textonly_reference('ValueSet') 
           end
-        when FHIR::Conformance
-          resource.fhirVersion = 'DSTU2'
+        when FHIR::Condition
+          if resource.onsetAge
+            resource.onsetAge.system = 'http://unitsofmeasure.org'
+            resource.onsetAge.code = 'a'
+            resource.onsetAge.unit = 'yr'
+            resource.onsetAge.comparator = nil
+          end
+          if resource.abatementAge
+            resource.abatementAge.system = 'http://unitsofmeasure.org'
+            resource.abatementAge.code = 'a'
+            resource.abatementAge.unit = 'yr'
+            resource.abatementAge.comparator = nil
+          end
+          # Make sure the onsetAge is before the abatementAge. If it's not (and both exist), flip them around
+          if resource.onsetAge && resource.abatementAge
+            if resource.onsetAge.value > resource.abatementAge.value
+              # This is the "Ruby Way" to swap two variables without using a temporary third variable
+              resource.onsetAge, resource.abatementAge = resource.abatementAge, resource.onsetAge
+            end
+          end
+        when FHIR::CapabilityStatement
+          resource.fhirVersion = 'STU3'
           resource.format = ['xml','json']
           if resource.kind == 'capability'
             resource.implementation = nil
@@ -369,16 +412,44 @@ module Crucible
           end
           resource.messaging.each{|m| m.endpoint = nil} if resource.kind != 'instance'
         when FHIR::Contract
-          resource.actor.each do |actor|
-            actor.entity = textonly_reference('Patient')
+          resource.agent.each do |agent|
+            agent.actor = textonly_reference('Patient')
+          end
+          resource.valuedItem.each do |item|
+            if item.unitPrice
+              item.unitPrice.system = 'urn:iso:std:iso:4217'
+              item.unitPrice.code = 'USD'
+              item.unitPrice.unit = nil
+              item.unitPrice.comparator = nil
+            end
+            if item.net
+              item.net.system = 'urn:iso:std:iso:4217'
+              item.net.code = 'USD'
+              item.net.unit = nil
+              item.net.comparator = nil
+            end
           end
           resource.term.each do |term|
-            term.actor.each do |actor|
-              actor.entity = textonly_reference('Organization')
+            term.agent.each do |agent|
+              agent.actor = textonly_reference('Organization')
             end
             term.group.each do |group|
-              group.actor.each do |actor|
-                actor.entity = textonly_reference('Organization')
+              group.agent.each do |agent|
+                agent.actor = textonly_reference('Organization')
+              end
+            end
+            term.valuedItem.each do |item|
+              if item.unitPrice
+                item.unitPrice.system = 'urn:iso:std:iso:4217'
+                item.unitPrice.code = 'USD'
+                item.unitPrice.unit = nil
+                item.unitPrice.comparator = nil
+              end
+              if item.net
+                item.net.system = 'urn:iso:std:iso:4217'
+                item.net.code = 'USD'
+                item.net.unit = nil
+                item.net.comparator = nil
               end
             end
           end
@@ -396,8 +467,13 @@ module Crucible
           end
         when FHIR::DataElement
           resource.mapping.each do |m|
-            m.fhirIdentity = SecureRandom.base64 if m.fhirIdentity.nil?
-            m.fhirIdentity.gsub!(/[^0-9A-Za-z]/, '')
+            m.identity = SecureRandom.base64 if m.identity.nil?
+            m.identity.gsub!(/[^0-9A-Za-z]/, '')
+          end
+        when FHIR::DeviceComponent
+          resource.languageCode.coding.each do |c|
+            c.system = 'http://tools.ietf.org/html/bcp47'
+            c.code = 'en-US'
           end
         when FHIR::DeviceMetric
           resource.measurementPeriod = nil
@@ -422,21 +498,61 @@ module Crucible
           end
           resource.condition = keys
           resource.mapping.each do |m|
-            m.fhirIdentity = SecureRandom.base64 if m.fhirIdentity.nil?
-            m.fhirIdentity.gsub!(/[^0-9A-Za-z]/, '')
+            m.identity = SecureRandom.base64 if m.identity.nil?
+            m.identity.gsub!(/[^0-9A-Za-z]/, '')
           end
           resource.max = "#{resource.min+1}"
           # TODO remove bindings for things that can't be code, Coding, CodeableConcept
           is_codeable = false
-          resource.fhirType.each do |f|
+          resource.type.each do |f|
             is_codeable = (['code','Coding','CodeableConcept'].include?(f.code))
+            f.aggregation = []
           end
           resource.binding = nil unless is_codeable
+          resource.contentReference = nil
+          FHIR::ElementDefinition::MULTIPLE_TYPES['defaultValue'].each do |type|
+            resource.instance_variable_set("@defaultValue#{type.capitalize}".to_sym, nil)
+            resource.instance_variable_set("@fixed#{type.capitalize}".to_sym, nil)
+            resource.instance_variable_set("@pattern#{type.capitalize}".to_sym, nil)
+            resource.instance_variable_set("@example#{type.capitalize}".to_sym, nil)
+            resource.instance_variable_set("@minValue#{type.capitalize}".to_sym, nil)
+            resource.instance_variable_set("@maxValue#{type.capitalize}".to_sym, nil)
+          end
+        when FHIR::ExpansionProfile
+          resource.designation.exclude = nil
+        when FHIR::FamilyMemberHistory
+          if resource.ageAge
+            resource.ageAge.system = 'http://unitsofmeasure.org'
+            resource.ageAge.code = 'a'
+            resource.ageAge.unit = nil
+            resource.ageAge.comparator = nil
+          end
+          if SecureRandom.random_number(1)==0
+            resource.bornPeriod = nil
+            resource.bornDate = nil
+            resource.bornString = nil
+          else
+            resource.ageAge = nil
+            resource.ageRange = nil
+            resource.ageString = nil
+          end
+          if resource.deceasedAge
+            resource.deceasedAge.system = 'http://unitsofmeasure.org'
+            resource.deceasedAge.code = 'a'
+            resource.deceasedAge.unit = nil
+            resource.deceasedAge.comparator = nil
+          end
         when FHIR::Goal
           resource.outcome.each do |outcome|
             outcome.resultCodeableConcept = nil
             outcome.resultReference = textonly_reference('Observation')
           end
+          if resource.targetDuration
+            resource.targetDuration.system = 'http://unitsofmeasure.org'
+            resource.targetDuration.code = 'a'
+            resource.targetDuration.unit = nil
+            resource.targetDuration.comparator = nil
+          end
         when FHIR::Group
           resource.member = [] if resource.actual==false
           resource.characteristic.each do |c|
@@ -445,30 +561,32 @@ module Crucible
             c.valueQuantity = nil
             c.valueRange = nil
           end
-        when FHIR::ImagingObjectSelection
-          resource.uid = random_oid
-          index = SecureRandom.random_number(FHIR::ImagingObjectSelection::VALID_CODES[:title].length)
-          code = FHIR::ImagingObjectSelection::VALID_CODES[:title][index]
-          resource.title = minimal_codeableconcept('http://nema.org/dicom/dicm',code)
-          resource.study.each do |study|
-            study.uid = random_oid
-            study.series.each do |series|
-              series.uid = random_oid
-              series.instance.each do |instance|
-                instance.sopClass = random_oid
-                instance.uid = random_oid
-              end
-            end
-          end
         when FHIR::ImagingStudy
           resource.uid = random_oid
+          availability = ['ONLINE', 'OFFLINE', 'NEARLINE', 'UNAVAILABLE']
           resource.series.each do |series|
             series.uid=random_oid
+            series.availability = availability.sample
             series.instance.each do |instance|
               instance.uid = random_oid
               instance.sopClass = random_oid
             end
           end
+          resource.availability = availability.sample
+        when FHIR::ImagingManifest
+          resource.title.coding.each{|c|c.code=['113000', '113002', '113003', '113004', '113005', '113006', '113007', '113008', '113009'].sample}
+          resource.study.each do |study|
+            study.series.each do |series|
+              series.baseLocation.each do |b| 
+                b.type = minimal_coding('http://hl7.org/fhir/dWebType',['WADO-RS', 'WADO-URI', 'IID'].sample)
+                b.url = "http://projectcrucible.org/#{SecureRandom.base64}"
+              end
+              series.instance.each do |i|
+                i.sopClass = random_oid
+                i.uid = random_oid
+              end
+            end
+          end
         when FHIR::Immunization
           if resource.wasNotGiven
             resource.explanation.reasonNotGiven = [ textonly_codeableconcept("reasonNotGiven #{SecureRandom.base64}") ]
@@ -479,7 +597,7 @@ module Crucible
             resource.explanation.reason = [ textonly_codeableconcept("reason #{SecureRandom.base64}") ]
           end
         when FHIR::ImplementationGuide
-          resource.fhirVersion = "DSTU2"
+          resource.fhirVersion = "STU3"
           resource.package.each do |package|
             package.resource.each do |r|
               r.sourceUri = nil
@@ -489,14 +607,14 @@ module Crucible
         when FHIR::List
           resource.emptyReason = nil
           resource.entry.each do |entry|
-            resource.mode = 'changes' if !entry.fhirDeleted.nil?
+            resource.mode = 'changes' if !entry.deleted.nil?
           end
         when FHIR::Media
-          if resource.fhirType == 'video'
+          if resource.type == 'video'
             resource.frames = nil
-          elsif resource.fhirType == 'photo'
+          elsif resource.type == 'photo'
             resource.duration = nil
-          elsif resource.fhirType == 'audio'
+          elsif resource.type == 'audio'
             resource.height = nil
             resource.width = nil
             resource.frames = nil            
@@ -511,9 +629,9 @@ module Crucible
           end
         when FHIR::MedicationAdministration
           date = DateTime.now
-          resource.effectiveTimeDateTime = date.strftime("%Y-%m-%dT%T.%LZ")
-          resource.effectiveTimePeriod = nil
-          if resource.wasNotGiven
+          resource.effectiveDateTime = date.strftime("%Y-%m-%dT%T.%LZ")
+          resource.effectivePeriod = nil
+          if resource.notGiven
             resource.reasonGiven = nil
           else
             resource.reasonNotGiven = nil
@@ -524,12 +642,12 @@ module Crucible
           resource.medicationReference = textonly_reference('Medication')
           resource.medicationCodeableConcept = nil
           resource.dosageInstruction.each {|d|d.timing = nil }
-        when FHIR::MedicationOrder
+        when FHIR::MedicationRequest
           resource.medicationReference = textonly_reference('Medication')
           resource.medicationCodeableConcept = nil
           resource.dosageInstruction.each {|d|d.timing = nil }
         when FHIR::MedicationStatement
-          resource.reasonNotTaken = nil if resource.wasNotTaken != true
+          resource.reasonNotTaken = nil if resource.notTaken != true
           resource.medicationReference = textonly_reference('Medication')
           resource.medicationCodeableConcept = nil
           resource.dosage.each{|d|d.timing=nil}
@@ -539,13 +657,14 @@ module Crucible
           resource.replacedBy = nil if resource.status!='retired'
           if resource.kind == 'root'
             resource.uniqueId.each do |uid|
-              uid.fhirType='other' if ['uuid','oid'].include?(uid.fhirType)
+              uid.type='uuid'
+              uid.value = SecureRandom.uuid
             end
           end
           resource.uniqueId.each do |uid|
             uid.preferred = nil
           end
-        when FHIR::NutritionOrder
+        when FHIR::NutritionRequest
           resource.oralDiet.schedule = nil if resource.oralDiet
           resource.supplement.each{|s|s.schedule=nil}
           resource.enteralFormula.administration = nil if resource.enteralFormula
@@ -553,35 +672,85 @@ module Crucible
           resource.parameter.each do |p|
             p.binding = nil
             p.part = nil
+            p.searchType = nil unless p.type == 'string'
           end
-        when FHIR::Order
-          resource.when.schedule = nil
         when FHIR::Patient
           resource.maritalStatus = minimal_codeableconcept('http://hl7.org/fhir/v3/MaritalStatus','S')
+        when FHIR::PlanDefinition
+          resource.actionDefinition.each do |a|
+            a.actionDefinition.each do |b|
+              b.relatedAction = []
+            end
+          end
         when FHIR::Procedure
           resource.reasonNotPerformed = nil if resource.notPerformed != true
           resource.focalDevice.each do |fd|
-            fd.action = minimal_codeableconcept('http://hl7.org/fhir/ValueSet/device-action','implanted')
+            code = ['implanted', 'explanted', 'manipulated'].sample
+            fd.action = minimal_codeableconcept('http://hl7.org/fhir/device-action', code)
           end
         when FHIR::Provenance
           resource.entity.each do |e|
-            e.agent.relatedAgent = nil if e.agent
+            e.agent.each{|a| a.relatedAgentType = nil }
+          end
+        when FHIR::Practitioner
+          resource.communication.each do |comm|
+            comm.coding.each do |c|
+              c.system = 'http://tools.ietf.org/html/bcp47'
+              c.code = 'en-US'
+            end
           end
         when FHIR::RelatedPerson
           resource.relationship = minimal_codeableconcept('http://hl7.org/fhir/patient-contact-relationship','family')
         when FHIR::Questionnaire
-          resource.group.required = true
-          resource.group.group = nil
-          resource.group.question.each {|q|q.options = nil }
+          resource.item.each do |i|
+            i.required = true
+            i.item = []
+            i.options = nil
+            i.option = []
+            if ['choice','open-choice'].include?(i.type)
+              choice_a = FHIR::Questionnaire::Item::Option.new({'valueString'=>'true'})
+              choice_b = FHIR::Questionnaire::Item::Option.new({'valueString'=>'false'})
+              i.option = [ choice_a, choice_b ] 
+            end
+            if i.type=='display'
+              i.required = nil
+              i.repeats = nil
+              i.readOnly = nil
+              i.concept = []
+              FHIR::Questionnaire::Item::MULTIPLE_TYPES['initial'].each do |type|
+                i.instance_variable_set("@initial#{type.capitalize}".to_sym, nil)
+              end
+            end
+            i.enableWhen.each do |ew|
+              ew.hasAnswer = false
+              ew.hasAnswer = nil if ew.answer
+            end
+            i.maxLength = nil if !['boolean', 'decimal', 'integer', 'string', 'text', 'url'].include?(i.type)
+          end
         when FHIR::QuestionnaireResponse
-          resource.group.group = nil
-          resource.group.question.each {|q|q.answer = nil }
+          resource.item.each do |i|
+            i.item = nil
+            i.answer.each {|q|q.valueBoolean = true if !q.value }
+          end
+        when FHIR::Range
+          # validate that the low/high values in the range are correct (e.g. the low value is not higher than the high value)
+          if resource.low && resource.high
+            if resource.low.value > resource.high.value
+              # This is the "Ruby Way" to swap two variables without using a temporary third variable
+              resource.low.value,resource.high.value = resource.high.value,resource.low.value
+            end
+          end
+        when FHIR::Signature
+          resource.type = [ minimal_coding('urn:iso-astm:E1762-95:2013','1.2.840.10065.1.12.1.18') ]
+          resource.whoUri = 'http://projectcrucible.org'
+          resource.whoReference = nil
         when FHIR::Subscription
-          resource.status = 'requested' if resource.xmlId.nil?
+          resource.status = 'requested' if resource.id.nil?
           resource.channel.payload = 'applicaton/json+fhir'
           resource.end = nil
+          resource.criteria = 'Observation?code=http://loinc.org|1975-2'
         when FHIR::SupplyDelivery
-          resource.fhirType = minimal_codeableconcept('http://hl7.org/fhir/supply-item-type','medication')
+          resource.type = minimal_codeableconcept('http://hl7.org/fhir/supply-item-type','medication')
         when FHIR::SupplyRequest
           resource.kind = minimal_codeableconcept('http://hl7.org/fhir/supply-kind','central')
           if resource.when 
@@ -589,10 +758,44 @@ module Crucible
             resource.when.code = minimal_codeableconcept('http://snomed.info/sct','20050000') #biweekly
           end
         when FHIR::StructureDefinition
-          resource.fhirVersion = 'DSTU2'
-          resource.snapshot.element.first.path = resource.constrainedType if resource.snapshot && resource.snapshot.element
+          resource.derivation = 'constraint'
+          resource.fhirVersion = 'STU3'
+          resource.baseDefinition = "http://hl7.org/fhir/StructureDefinition/#{resource.type}"
+          is_pattern = (SecureRandom.random_number(1)==0)
+          if resource.snapshot && resource.snapshot.element
+            resource.snapshot.element.first.id = resource.type
+            resource.snapshot.element.first.path = resource.type 
+            resource.snapshot.element.first.label = nil
+            resource.snapshot.element.first.code = nil
+            resource.snapshot.element.first.requirements = nil
+            resource.snapshot.element.first.type = nil
+            if is_pattern
+              FHIR::ElementDefinition::MULTIPLE_TYPES['defaultValue'].each do |type|
+                resource.snapshot.element.first.instance_variable_set("@defaultValue#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@fixed#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@example#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@minValue#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@maxValue#{type.capitalize}".to_sym, nil)
+              end
+            else
+              FHIR::ElementDefinition::MULTIPLE_TYPES['defaultValue'].each do |type|
+                resource.snapshot.element.first.instance_variable_set("@defaultValue#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@pattern#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@example#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@minValue#{type.capitalize}".to_sym, nil)
+                resource.snapshot.element.first.instance_variable_set("@maxValue#{type.capitalize}".to_sym, nil)
+              end
+            end
+          end
+          if resource.differential && resource.differential.element
+            resource.differential.element[0] = resource.snapshot.element[0]
+          end
           resource.mapping.each do |m|
-            m.fhirIdentity.gsub!(/[^0-9A-Za-z]/, '') if m.fhirIdentity
+            m.identity.gsub!(/[^0-9A-Za-z]/, '') if m.identity
+          end
+        when FHIR::StructureMap
+          resource.group.each do |g|
+            g.rule.each{|r|r.rule = nil}
           end
         when FHIR::TestScript
           resource.variable.each do |v|
@@ -600,7 +803,6 @@ module Crucible
             v.path = nil if v.headerField
           end
           if resource.setup
-            resource.setup.metadata = nil 
             resource.setup.action.each do |a|
               a.assert = nil if a.operation
               apply_invariants!(a.operation) if a.operation
@@ -608,7 +810,6 @@ module Crucible
             end
           end
           resource.test.each do |test|
-            test.metadata = nil
             test.action.each do |a|
               a.assert = nil if a.operation
               apply_invariants!(a.operation) if a.operation
@@ -620,7 +821,7 @@ module Crucible
               apply_invariants!(a.operation) if a.operation
             end
           end
-        when FHIR::TestScript::TestScriptSetupActionAssertComponent
+        when FHIR::TestScript::Setup::Action::Assert
           # an assertion can only contain one of these...
           keys = ['contentType','headerField','minimumId','navigationLinks','path','resource','responseCode','response','validateProfileId']
           has_keys = []
@@ -633,7 +834,7 @@ module Crucible
           end
           resource.sourceId.gsub!(/[^0-9A-Za-z]/, '') if resource.sourceId
           resource.validateProfileId.gsub!(/[^0-9A-Za-z]/, '') if resource.validateProfileId
-        when FHIR::TestScript::TestScriptSetupActionOperationComponent
+        when FHIR::TestScript::Setup::Action::Operation
           resource.responseId.gsub!(/[^0-9A-Za-z]/, '') if resource.responseId
           resource.sourceId.gsub!(/[^0-9A-Za-z]/, '') if resource.sourceId
           resource.targetId.gsub!(/[^0-9A-Za-z]/, '') if resource.targetId