diff --git a/tests_zen_project/zen-package.edn b/tests_zen_project/zen-package.edn
index 0d51c4b..64c6fe0 100644
--- a/tests_zen_project/zen-package.edn
+++ b/tests_zen_project/zen-package.edn
@@ -1,2 +1 @@
-{:deps {hl7-fhir-r4-core "https://github.com/zen-fhir/hl7-fhir-r4-core.git"
-        hl7-fhir-uv-sdc "https://github.com/zen-fhir/hl7-fhir-uv-sdc.git"}}
+{:deps {beda-emr-core "https://github.com/beda-software/beda-emr-core.git"}}
diff --git a/tests_zen_project/zrc/questionnaire-profile.edn b/tests_zen_project/zrc/questionnaire-profile.edn
index 2c35e67..698468a 100644
--- a/tests_zen_project/zrc/questionnaire-profile.edn
+++ b/tests_zen_project/zrc/questionnaire-profile.edn
@@ -1,115 +1,9 @@
 {ns questionnaire-profile
- import #{hl7-fhir-r4-core.CodeableConcept
-          hl7-fhir-r4-core.integer
-          hl7-fhir-r4-core.boolean
-          hl7-fhir-r4-core.Reference
-          hl7-fhir-r4-core.Questionnaire
-          hl7-fhir-r4-core.string
-          hl7-fhir-r4-core.Quantity
-          hl7-fhir-r4-core.questionnaire-constraint
-          hl7-fhir-r4-core.questionnaire-referenceResource
-          hl7-fhir-r4-core.questionnaire-itemControl
-          hl7-fhir-r4-core.questionnaire-sliderStepValue
-          hl7-fhir-r4-core.questionnaire-unit
-          hl7-fhir-r4-core.questionnaire-hidden
-          hl7-fhir-r4-core.variable
-          hl7-fhir-uv-sdc.sdc-questionnaire-answerExpression
-          hl7-fhir-uv-sdc.sdc-questionnaire-choiceColumn
-          hl7-fhir-uv-sdc.sdc-questionnaire-initialExpression
-          hl7-fhir-uv-sdc.sdc-questionnaire-calculatedExpression
-          hl7-fhir-uv-sdc.sdc-questionnaire-itemPopulationContext
-          hl7-fhir-uv-sdc.sdc-questionnaire-enableWhenExpression
-          hl7-fhir-uv-sdc.sdc-questionnaire-assembleContext
-          hl7-fhir-uv-sdc.sdc-questionnaire-launchContext
-          hl7-fhir-uv-sdc.sdc-questionnaire-sourceQueries
-          hl7-fhir-uv-sdc.sdc-questionnaire-subQuestionnaire
-          hl7-fhir-uv-sdc.sdc-questionnaire-targetStructureMap}
-
- QuestionnaireItem {:zen/tags #{zen/schema
-                                zen.fhir/structure-schema}
-                    :type zen/map
-                    :zen.fhir/version "0.6.23-1"
-                    :confirms #{hl7-fhir-r4-core.Questionnaire/item-schema}
-                    :keys {:item {:type zen/vector
-                                  :every {:confirms #{QuestionnaireItem}}}
-                           :itemConstraint {:type zen/vector
-                                            :every {:confirms #{hl7-fhir-r4-core.questionnaire-constraint/schema}
-                                                    :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/questionnaire-constraint"}}
-                           :variable {:type zen/vector,
-                                      :every {:confirms #{hl7-fhir-r4-core.variable/schema},
-                                              :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/variable"}},
-                           :subQuestionnaire {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-subQuestionnaire/schema},
-                                              :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire"}
-                           :answerExpression {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-answerExpression/schema},
-                                              :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-answerExpression",
-                                              :fhir/flags #{:MS}},
-                           :choiceColumn {:type zen/vector,
-                                          :every {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-choiceColumn/schema},
-                                                  :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-choiceColumn"}},
-                           :initialExpression {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-initialExpression/schema},
-                                               :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression"},
-                           :referenceResource {:type zen/vector,
-                                               :every {:confirms #{hl7-fhir-r4-core.questionnaire-referenceResource/schema},
-                                                       :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/questionnaire-referenceResource",
-                                                       :fhir/flags #{:MS}}},
-                           :itemControl {:confirms #{hl7-fhir-r4-core.questionnaire-itemControl/schema},
-                                         :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-                                         :fhir/flags #{:MS}},
-                           :sliderStepValue {:confirms #{hl7-fhir-r4-core.questionnaire-sliderStepValue/schema},
-                                             :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue"}
-                           :calculatedExpression {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-calculatedExpression/schema},
-                                                  :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression"}
-                           :itemPopulationContext {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-itemPopulationContext/schema}
-                                                   :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext"
-                                                   :fhir/flags #{:MS}}
-                           :enableWhenExpression {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-enableWhenExpression/schema},
-                                                  :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-                                                  :fhir/flags #{:MS}},
-                           :start {:confirms #{hl7-fhir-r4-core.integer/schema}
-                                   :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/slider-start"}
-                           :stop {:confirms #{hl7-fhir-r4-core.integer/schema}
-                                  :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/slider-stop"}
-                           :startLabel {:confirms #{hl7-fhir-r4-core.string/schema}
-                                        :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/slider-start-label"}
-                           :stopLabel {:confirms #{hl7-fhir-r4-core.string/schema}
-                                       :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/slider-stop-label"}
-                           :helpText {:confirms #{hl7-fhir-r4-core.string/schema}
-                                      :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/help-text"}
-
-                           :adjustLastToRight {:confirms #{hl7-fhir-r4-core.boolean/schema}
-                                               :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/adjust-last-to-right"}
-                           :unit {:confirms #{hl7-fhir-r4-core.questionnaire-unit/schema},
-                                  :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/questionnaire-unit"}
-                           :macro {:confirms #{hl7-fhir-r4-core.string/schema}
-                                   :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/macro"}
-                           ;; use hidden key over itemHidden from zen sdc zen profile
-                           :hidden {:confirms #{hl7-fhir-r4-core.questionnaire-hidden/schema},
-                                    :fhir/extensionUri "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden"},
-                           :inlineChoiceDirection {:confirms #{hl7-fhir-r4-core.string/schema}
-                                                   :fhir/extensionUri "https://beda.software/fhir-emr-questionnaire/inline-choice-direction"}}}
+ import #{beda-emr-core.questionnaire}
 
  QuestionnaireProfile
  {:zen/tags #{zen.fhir/base-schema zen/schema}
   :zen.fhir/type "Questionnaire"
   :type zen/map
-  :zen.fhir/version "0.6.23-1"
-  :confirms #{hl7-fhir-r4-core.Questionnaire/schema}
-  :keys {:mapping {:type zen/vector
-                   :every {:confirms #{hl7-fhir-r4-core.Reference/schema}
-                           :fhir/extensionUri "http://beda.software/fhir-extensions/questionnaire-mapper"}}
-         :sourceQueries {:type zen/vector
-                         :every {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-sourceQueries/schema}
-                                 :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries"}}
-         :launchContext {:type zen/vector
-                         :every {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-launchContext/schema}
-                                 :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"}}
-         :assembleContext {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-assembleContext/schema},
-                           :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
-                           :fhir/flags #{:MS}}
-         :itemPopulationContext {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-itemPopulationContext/schema}
-                                 :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext"}
-         :targetStructureMap {:type zen/vector
-                              :every {:confirms #{hl7-fhir-uv-sdc.sdc-questionnaire-targetStructureMap/schema}
-                                      :fhir/extensionUri "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap"}}
-         :item {:type zen/vector
-                :every {:confirms #{QuestionnaireItem}}}}}}
+  :zen.fhir/version "0.6.32"
+  :confirms #{hl7-fhir-r4-core.Questionnaire/schema beda-emr-core.questionnaire/schema}}}