diff --git a/config/config.yml b/config/config.yml
index 23226d3..c6f1868 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -28,8 +28,9 @@ pipeline:
 - name: NLUCommandAdapter
 - name: SingleStepLLMCommandGenerator
   llm:
-    model: gpt-4
+    provider: openai
     timeout: 7
+    model: gpt-4o
     temperature: 0.0
     top_p: 0.0
 
diff --git a/e2e_tests/passing/disambiguation/user_sends_short_noun_only_message.yml b/e2e_tests/passing/disambiguation/user_sends_short_noun_only_message.yml
index 392b4fb..dac9c61 100644
--- a/e2e_tests/passing/disambiguation/user_sends_short_noun_only_message.yml
+++ b/e2e_tests/passing/disambiguation/user_sends_short_noun_only_message.yml
@@ -1,13 +1,11 @@
-# BUG: WAITING FOR https://rasahq.atlassian.net/browse/ENG-1091
+fixtures:
+  - route_to_calm:
+      - route_session_to_calm: True
 
-#fixtures:
-#  - route_to_calm:
-#      - route_session_to_calm: True
-#
-#test_cases:
-#  - test_case: user sends short noun only message
-#    fixtures:
-#      - route_to_calm
-#    steps:
-#      - user: cash
-#      - utter: utter_clarification_options_rasa
+test_cases:
+  - test_case: user sends short noun only message
+    fixtures:
+      - route_to_calm
+    steps:
+      - user: cash
+      - utter: utter_clarification_options_rasa
diff --git a/e2e_tests/passing/disambiguation/user_sends_short_verb_only_message.yml b/e2e_tests/passing/disambiguation/user_sends_short_verb_only_message.yml
index 081f5c3..37fea55 100644
--- a/e2e_tests/passing/disambiguation/user_sends_short_verb_only_message.yml
+++ b/e2e_tests/passing/disambiguation/user_sends_short_verb_only_message.yml
@@ -1,15 +1,13 @@
-# BUG: WAITING FOR https://rasahq.atlassian.net/browse/ENG-1091
+fixtures:
+  - route_to_calm:
+      - route_session_to_calm: True
 
-#fixtures:
-#  - route_to_calm:
-#      - route_session_to_calm: True
-#
-#test_cases:
-#  - test_case: user sends short verb only message
-#    fixtures:
-#      - route_to_calm
-#    steps:
-#      - user: add
-#      - utter: utter_clarification_options_rasa
-#      - user: contact
-#      - utter: utter_ask_add_contact_handle
+test_cases:
+  - test_case: user sends short verb only message
+    fixtures:
+      - route_to_calm
+    steps:
+      - user: add
+      - utter: utter_clarification_options_rasa
+      - user: contact
+      - utter: utter_ask_add_contact_handle
diff --git a/e2e_tests/passing/negations/users_says_they_dont_want_the_former_option.yml b/e2e_tests/passing/negations/users_says_they_dont_want_the_former_option.yml
index a9845ab..4090307 100644
--- a/e2e_tests/passing/negations/users_says_they_dont_want_the_former_option.yml
+++ b/e2e_tests/passing/negations/users_says_they_dont_want_the_former_option.yml
@@ -1,15 +1,13 @@
-# BUG: WAITING FOR https://rasahq.atlassian.net/browse/ENG-1091
+fixtures:
+  - route_to_calm:
+      - route_session_to_calm: True
 
-#fixtures:
-#  - route_to_calm:
-#      - route_session_to_calm: True
-#
-#test_cases:
-#  - test_case: user says they don't want the former option
-#    fixtures:
-#      - route_to_calm
-#    steps:
-#      - user: add
-#      - utter: utter_clarification_options_rasa
-#      - user: not the former
-#      - utter: utter_ask_add_contact_handle
+test_cases:
+  - test_case: user says they don't want the former option
+    fixtures:
+      - route_to_calm
+    steps:
+      - user: add
+      - utter: utter_clarification_options_rasa
+      - user: not the former
+      - utter: utter_ask_add_contact_handle