diff --git a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature b/openecomp-bdd/features/TOSCA/CapabilityDataType.feature
index 64a0377..7148333 100644
--- a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature
+++ b/openecomp-bdd/features/TOSCA/CapabilityDataType.feature
@@ -2,6 +2,7 @@
 
   Background: Init
     Given I want to create a VLM
+    Given I want to set all Togglz to be "true"
 
   Scenario: Test Capability type in service template
     When I want to create a VSP with onboarding type "NetworkPackage"
diff --git a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature
index 6915e7b..db5ac80 100644
--- a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature
+++ b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature
@@ -2,6 +2,7 @@
 
   Background: Init
     Given I want to create a VLM
+    Given I want to set all Togglz to be "true"
 
   Scenario: Full - Create and submit VSP Network Package and Create VF
     When I want to create a VSP with onboarding type "NetworkPackage"
@@ -19,7 +20,8 @@
 
     Then I want to create a VF for this Item
 
-  Scenario: Full - Input parameter annotation validation.
+  Scenario: Validate Input parameter - annotation was added
+
     When I want to create a VSP with onboarding type "NetworkPackage"
 
     Then I want to upload a NetworkPackage for this VSP from path "resources/uploads/inputsForNestedHeat.zip"
@@ -51,6 +53,22 @@
     Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.vf_module_label[0]" for value "main-heat2"
     Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.param_name" for value "dummy_net_netmask_1"
 
+    Then I want to create a VF for this Item
+
+  Scenario: Validate Input parameter  - annotation was not added
+
+    When I want to create a VSP with onboarding type "NetworkPackage"
+
+    Then I want to upload a NetworkPackage for this VSP from path "resources/uploads/inputsForNestedHeat.zip"
+    And I want to process the NetworkPackage file for this VSP
+
+    Then I want to commit this Item
+    And I want to submit this VSP
+    And I want to package this VSP
+
+    Then I want to get the package for this Item to path "resources/downloads/VSPPackage.zip"
+
+    When I want to load the yaml content of the entry "Definitions/MainServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" to context
     Then I want to check property "topology_template.inputs.OS::stack_name" exists
     Then I want to check property "topology_template.inputs.OS::stack_name.annotations" does not exist
 
@@ -58,6 +76,7 @@
     Then I want to check property "topology_template.inputs.port_pcm_port_0_network_role.annotations" does not exist
     Then I want to check property "topology_template.inputs.availabilityzone_name.annotations" does not exist
     Then I want to check property "topology_template.inputs.pcm_server_name.annotations" does not exist
+    Then I want to check property "topology_template.inputs.sm_server_names.annotations" does not exist
 
     When I want to load the yaml content of the entry "Definitions/nested-pcm_v0.2ServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" to context
     Then I want to check property "topology_template.inputs.port_pcm_port_13_mac_requirements.annotations" does not exist
diff --git a/openecomp-bdd/features/TOSCA/HeatValidation.feature b/openecomp-bdd/features/TOSCA/HeatValidation.feature
index 69d6093..ce6a8e7 100644
--- a/openecomp-bdd/features/TOSCA/HeatValidation.feature
+++ b/openecomp-bdd/features/TOSCA/HeatValidation.feature
@@ -2,6 +2,7 @@
 
   Background: Init
     Given I want to create a VLM
+    Given I want to set all Togglz to be "true"
 
   Scenario: Test Validation Error
     When I want to create a VSP with onboarding type "NetworkPackage"