diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 4df750748c44..ff2fcf8316a9 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -29,6 +29,7 @@ jobs:
         pip install -r requirements/tests.txt
         pip install ./test/unittests/common_query/ovos_tskill_fakewiki
         pip install ./test/end2end/session/skill-ovos-hello-world
+        pip install ./test/end2end/session/skill-ovos-fallback-unknown
     - name: Generate coverage report
       run: |
         pytest --cov=ovos_core --cov-report xml test/unittests
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index abab50a2879f..53e2335ecc85 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -56,6 +56,7 @@ jobs:
           pip install -r requirements/tests.txt
           pip install ./test/unittests/common_query/ovos_tskill_fakewiki
           pip install ./test/end2end/session/skill-ovos-hello-world
+          pip install ./test/end2end/session/skill-ovos-fallback-unknown
       - name: Run unittests
         run: |
           pytest --cov=ovos_core --cov-report xml test/unittests
diff --git a/ovos_core/intent_services/fallback_service.py b/ovos_core/intent_services/fallback_service.py
index baac1ded0615..0a3434a3e6e7 100644
--- a/ovos_core/intent_services/fallback_service.py
+++ b/ovos_core/intent_services/fallback_service.py
@@ -165,7 +165,7 @@ def _fallback_range(self, utterances, lang, message, fb_range):
         for skill_id, prio in sorted_handlers:
             result = self.attempt_fallback(utterances, skill_id, lang, message)
             if result:
-                return ovos_core.intent_services.IntentMatch('Fallback', None, {}, None, utterances[0])
+                return ovos_core.intent_services.IntentMatch('Fallback', None, {}, skill_id, utterances[0])
 
         # old style deprecated fallback skill singleton class
         LOG.debug("checking for FallbackSkillsV1")
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/__init__.py b/test/end2end/session/skill-ovos-fallback-unknown/__init__.py
new file mode 100644
index 000000000000..897634e2610f
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/__init__.py
@@ -0,0 +1,23 @@
+from ovos_workshop.skills.fallback import FallbackSkill
+from ovos_workshop.decorators import fallback_handler
+
+
+class UnknownSkill(FallbackSkill):
+
+    @fallback_handler(priority=100)
+    def handle_fallback(self, message):
+        utterance = message.data['utterance'].lower()
+
+        try:
+            self.report_metric('failed-intent', {'utterance': utterance})
+        except Exception:
+            self.log.exception('Error reporting metric')
+
+        for i in ['question', 'who.is', 'why.is']:
+            if self.voc_match(utterance, i):
+                self.log.debug('Fallback type: ' + i)
+                self.speak_dialog(i)
+                break
+        else:
+            self.speak_dialog('unknown')
+        return True
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/question.dialog
new file mode 100644
index 000000000000..582afa3522a2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/question.dialog
@@ -0,0 +1,4 @@
+Em sap greu, però no puc ajudar-vos en això.
+No estic segur de com ajudar-vos amb això.
+No us entenc, però aprenc coses noves cada dia.
+No sé com respondre a això.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/question.voc
new file mode 100644
index 000000000000..2c04bf6a4171
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/question.voc
@@ -0,0 +1,15 @@
+què és|què són
+què serà|què seran|què
+què ha fet|què va fer
+què fa
+què fa
+on és|on està|on són|on estan
+on serà|on seran
+(on|en quin lloc) (va ser|van ser|fou|foren)
+(on|en quin lloc)
+en quin lloc|on
+quan és
+on serà|quan serà
+quan (va ser|van ser|fou|foren)
+quan
+quan
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/unknown.dialog
new file mode 100644
index 000000000000..4ff3a8c5e5ad
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/unknown.dialog
@@ -0,0 +1,9 @@
+No us entenc, però aprenc coses noves cada dia.
+Ho sento, no ho entenc.
+No sé què significa això.
+Ho sento, no ho he entès.
+Ho sento, no ho entenc.
+No entenc.
+No estic segur d'haver-vos entès
+És possible que hàgiu de dir-ho d'una altra manera.
+Reformuleu la sol·licitud.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/who.is.dialog
new file mode 100644
index 000000000000..48148e6b3224
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/who.is.dialog
@@ -0,0 +1,2 @@
+No sé qui és.
+No estic segur de qui és.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/who.is.voc
new file mode 100644
index 000000000000..7d63f791eb32
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/who.is.voc
@@ -0,0 +1,5 @@
+qui és
+qui ho farà
+qui va fer
+qui 
+qui
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/why.is.dialog
new file mode 100644
index 000000000000..8ff14633e07b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/why.is.dialog
@@ -0,0 +1,5 @@
+No estic segur de com ajudar-vos amb això.
+No ho sé.
+No n'estic molt segur.
+No n'estic segur.
+No estic segur, però faig tot el possible per aprendre.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/why.is.voc
new file mode 100644
index 000000000000..b2da1f9937e5
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ca-es/why.is.voc
@@ -0,0 +1,5 @@
+per què
+per què
+per què
+per què
+per què
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/question.dialog
new file mode 100644
index 000000000000..5ebc8901b835
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/question.dialog
@@ -0,0 +1,4 @@
+Omlouvám se, s tím vám nemohu pomoci.
+Nevím jak bych vám s tím pomohl.
+Nerozumím, ale každý den se učím nové věci.
+Nejsem si jist jak odpovědět.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/question.voc
new file mode 100644
index 000000000000..927870dce94e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/question.voc
@@ -0,0 +1,11 @@
+co je
+co bylo
+co bude
+
+kde je
+kde bylo
+kde bude
+
+kdy je
+kdy bylo
+kdy bude
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/unknown.dialog
new file mode 100644
index 000000000000..3a2e88e6a3b0
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/unknown.dialog
@@ -0,0 +1,6 @@
+Omlouvám se, nerozumím.
+Nevím co to znamená.
+Nerozumím, ale každý den se učím nové věci.
+Nerozumím.
+Můžeš to říci jiným způsobem?
+Prosím, zopakuj to.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/who.is.dialog
new file mode 100644
index 000000000000..8a05b26601f5
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/who.is.dialog
@@ -0,0 +1,2 @@
+Nevím kdo to je.
+Nejsem si jistý kdo to je.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/who.is.voc
new file mode 100644
index 000000000000..38fb87be3dac
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/who.is.voc
@@ -0,0 +1,3 @@
+kdo je
+kdo byl
+kdo bude
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/why.is.dialog
new file mode 100644
index 000000000000..e2f02d3a7d94
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/why.is.dialog
@@ -0,0 +1,3 @@
+Nejsem si jistý jak bych vám s tím mohl pomoci.
+Nevím.
+Nejsem si jistý.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/why.is.voc
new file mode 100644
index 000000000000..2f7203e96aa8
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/cs-cz/why.is.voc
@@ -0,0 +1,3 @@
+proč je
+proč byl
+proč bude
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/question.dialog
new file mode 100644
index 000000000000..c7025b5e26c5
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/question.dialog
@@ -0,0 +1,4 @@
+Beklager, jeg kan ikke hjælp dig med det.
+Jeg er ikke sikker på hvodan jeg kan hjælp dig med det.
+Det forstår jeg ikke, men jeg lærer nyt hver dag.
+Jeg er ikke sikker på hvordan det kan besvares.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/question.voc
new file mode 100644
index 000000000000..457ae7ad3120
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/question.voc
@@ -0,0 +1,15 @@
+hvad er
+hvad vil
+hvad gør
+hvad gør
+hvad gør
+hvor er 
+hvor vil
+hvor skete
+hvor sker
+hvor sker
+hvornår er
+hvornår vil
+hvornår skete
+hvornår sker
+hvornår sker
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/unknown.dialog
new file mode 100644
index 000000000000..ae4852e0a703
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/unknown.dialog
@@ -0,0 +1,9 @@
+Det forstår jeg ikke, men jeg lærer nyt hver dag.
+Jeg beklager, men jeg forstår ikke.
+Jeg ved ikke hvad det betyder.
+Beklager, jeg fik ikke fat i det.
+Beklager, jeg forstår ikke.
+Jeg forstår ikke.
+Jeg er ikke sikker på jeg forstod dig.
+Du må prøve at sige det på en anden måde.
+Venligst omformulér din forespørgsel.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/who.is.dialog
new file mode 100644
index 000000000000..148e95895dc8
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/who.is.dialog
@@ -0,0 +1,2 @@
+Jeg ved ikke hvem det er.
+Jeg er ikke sikker på hvem det er.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/who.is.voc
new file mode 100644
index 000000000000..f788ee33190b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/who.is.voc
@@ -0,0 +1,5 @@
+Hvem er
+hvem vil
+hvem gjorde
+hvem gør
+hvem gør
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/why.is.dialog
new file mode 100644
index 000000000000..b7c9d91c1cd9
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/why.is.dialog
@@ -0,0 +1,5 @@
+Jeg er ikke sikker på hvodan jeg kan hjælp dig med det.
+Jeg ved det ikke.
+Jeg er ikke helt sikker.
+Jeg er ikke siker.
+Jeg er ikke sikker, men jeg gør mit bedste for at lære nyt.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/why.is.voc
new file mode 100644
index 000000000000..4839a4cceddc
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/da-dk/why.is.voc
@@ -0,0 +1,5 @@
+hvorfor er
+hvorfor vil
+hvorfor gøre
+hvorfor gøre
+hvorfor gøre
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/question.dialog
new file mode 100644
index 000000000000..5f4a1a3b2de4
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/question.dialog
@@ -0,0 +1,4 @@
+Entschuldige, ich kann dir dabei nicht helfen.
+Ich bin mir nicht sicher wie ich dir dabei helfen kann.
+Ich verstehe das nicht, aber ich lerne jeden Tag neue Dinge.
+Ich bin mir nicht sicher wie ich das beantworten soll.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/question.voc
new file mode 100644
index 000000000000..59761b4c5452
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/question.voc
@@ -0,0 +1,15 @@
+was ist
+was wird
+was tat
+was macht
+was tust
+wo ist
+wo wird
+wo wurde
+woher kommt
+wo tatest
+wann ist
+wann wird
+wann hat
+wann tut
+wann machen
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/unknown.dialog
new file mode 100644
index 000000000000..6c00d94c2bb6
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/unknown.dialog
@@ -0,0 +1,9 @@
+Ich verstehe das nicht, aber ich lerne jeden Tag neue Dinge.
+Es tut mir leid, ich verstehe nicht.
+Ich weiß nicht, was das bedeutet.
+Entschuldigung, dass habe ich nicht verstanden.
+Entschuldigung, ich verstehe nicht.
+Ich verstehe nicht.
+Ich bin nicht sicher, ob ich dich verstanden habe.
+Möglicherweise musst du das anders sagen.
+Bitte formuliere deinen Befehl um.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/who.is.dialog
new file mode 100644
index 000000000000..930922332d85
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/who.is.dialog
@@ -0,0 +1,2 @@
+Ich weiß nicht, wer das ist.
+Ich bin nicht sicher, wer das ist.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/who.is.voc
new file mode 100644
index 000000000000..58a61ae82909
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/who.is.voc
@@ -0,0 +1,5 @@
+wer ist
+wer wird
+wer machte
+wer macht
+wer macht
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/why.is.dialog
new file mode 100644
index 000000000000..71d7e9dbfc3a
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/why.is.dialog
@@ -0,0 +1,5 @@
+Ich bin mir nicht sicher wie ich dir dabei helfen kann.
+Ich weiß es nicht.
+Ich bin mir nicht ganz sicher.
+Ich bin mir nicht sicher.
+Ich bin mir nicht sicher, aber ich gebe mein Bestes, zu lernen.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/why.is.voc
new file mode 100644
index 000000000000..95dc727bc7ea
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/de-de/why.is.voc
@@ -0,0 +1,5 @@
+wieso ist
+warum wird
+warum machte
+warum macht
+warum machen
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.dialog
new file mode 100755
index 000000000000..719963517c5a
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.dialog
@@ -0,0 +1,4 @@
+I'm sorry I can't help you with that.
+I'm not sure how to help you with that.
+I don't understand, but I'm learning new things everyday.
+I'm not sure how to answer that.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.voc
new file mode 100644
index 000000000000..68f4b7b2f7e8
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.voc
@@ -0,0 +1,17 @@
+what is
+what will
+what did
+what does
+what do
+
+where is
+where will
+where did
+where does
+where do
+
+when is
+when will
+when did
+when does
+when do
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/unknown.dialog
new file mode 100755
index 000000000000..3f31d7bbc9aa
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/unknown.dialog
@@ -0,0 +1,9 @@
+I'm sorry, I don't understand.
+I don't know what that means.
+I don't understand, but I'm learning new things everyday.
+Sorry, I didn't catch that.
+Sorry, I don't understand.
+I don't understand.
+I'm not sure I understood you.
+You might have to say that a different way.
+Please rephrase your request.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.dialog
new file mode 100755
index 000000000000..01bc07ac2dcc
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.dialog
@@ -0,0 +1,2 @@
+I don't know who that is.
+I'm not sure who that is.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.voc
new file mode 100644
index 000000000000..3028282eebb2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.voc
@@ -0,0 +1,5 @@
+who is
+who will
+who did
+who does
+who do
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.dialog
new file mode 100755
index 000000000000..676a25f79387
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.dialog
@@ -0,0 +1,5 @@
+I'm not sure how to help you with that.
+I don't know.
+I'm not quite sure.
+I'm not sure.
+I'm not sure, but I'm doing my best to learn.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.voc
new file mode 100644
index 000000000000..5d8c450d37fd
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.voc
@@ -0,0 +1,5 @@
+why is
+why will
+why did
+why does
+why do
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/question.dialog
new file mode 100644
index 000000000000..f6d5130e0bd8
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/question.dialog
@@ -0,0 +1,4 @@
+Lo siento, no puedo ayudarte con eso.
+No tengo claro cómo puedo ayudarte con eso.
+No lo entiendo, pero aprendo cosas nuevas cada día.
+No sé como responder a eso.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/question.voc
new file mode 100644
index 000000000000..d6b2b993b4be
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/question.voc
@@ -0,0 +1,15 @@
+qué es|qué
+qué hará|qué
+qué hizo|qué
+qué hace|qué
+qué hace|qué
+dónde está|dónde
+dónde lo hará|dónde
+dónde
+dónde
+dónde
+cuándo es|cuándo
+dónde
+cuándo
+cuándo
+cuándo
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/unknown.dialog
new file mode 100644
index 000000000000..89c2fae0204d
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/unknown.dialog
@@ -0,0 +1,9 @@
+No lo entiendo, pero aprendo cosas nuevas cada día.
+Lo siento, no entiendo.
+No sé qué significa eso.
+Lo siento, no lo he pillado.
+Disculpa, no lo entiendo.
+No entiendo.
+Creo que no te sigo.
+Tal vez tengas que decir eso de otra manera.
+Por favor reformula tu petición.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/who.is.dialog
new file mode 100644
index 000000000000..5bdcb0730132
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/who.is.dialog
@@ -0,0 +1,2 @@
+No sé quién es ese.
+No estoy seguro de quién es.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/who.is.voc
new file mode 100644
index 000000000000..7136ab078e27
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/who.is.voc
@@ -0,0 +1,5 @@
+quién es|quién
+quién
+quién
+quién
+quién
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/why.is.dialog
new file mode 100644
index 000000000000..793f6590769e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/why.is.dialog
@@ -0,0 +1,5 @@
+No tengo claro cómo puedo ayudarte con eso.
+No lo sé.
+No estoy muy seguro.
+No estoy seguro.
+No estoy seguro, pero hago lo que puedo para aprenderlo.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/why.is.voc
new file mode 100644
index 000000000000..812fd69d6743
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-es/why.is.voc
@@ -0,0 +1,5 @@
+por qué
+por qué
+por qué
+por qué
+por qué
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/question.dialog
new file mode 100644
index 000000000000..f6d5130e0bd8
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/question.dialog
@@ -0,0 +1,4 @@
+Lo siento, no puedo ayudarte con eso.
+No tengo claro cómo puedo ayudarte con eso.
+No lo entiendo, pero aprendo cosas nuevas cada día.
+No sé como responder a eso.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/question.voc
new file mode 100644
index 000000000000..d6b2b993b4be
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/question.voc
@@ -0,0 +1,15 @@
+qué es|qué
+qué hará|qué
+qué hizo|qué
+qué hace|qué
+qué hace|qué
+dónde está|dónde
+dónde lo hará|dónde
+dónde
+dónde
+dónde
+cuándo es|cuándo
+dónde
+cuándo
+cuándo
+cuándo
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/unknown.dialog
new file mode 100644
index 000000000000..89c2fae0204d
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/unknown.dialog
@@ -0,0 +1,9 @@
+No lo entiendo, pero aprendo cosas nuevas cada día.
+Lo siento, no entiendo.
+No sé qué significa eso.
+Lo siento, no lo he pillado.
+Disculpa, no lo entiendo.
+No entiendo.
+Creo que no te sigo.
+Tal vez tengas que decir eso de otra manera.
+Por favor reformula tu petición.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/who.is.dialog
new file mode 100644
index 000000000000..5bdcb0730132
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/who.is.dialog
@@ -0,0 +1,2 @@
+No sé quién es ese.
+No estoy seguro de quién es.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/who.is.voc
new file mode 100644
index 000000000000..7136ab078e27
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/who.is.voc
@@ -0,0 +1,5 @@
+quién es|quién
+quién
+quién
+quién
+quién
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/why.is.dialog
new file mode 100644
index 000000000000..793f6590769e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/why.is.dialog
@@ -0,0 +1,5 @@
+No tengo claro cómo puedo ayudarte con eso.
+No lo sé.
+No estoy muy seguro.
+No estoy seguro.
+No estoy seguro, pero hago lo que puedo para aprenderlo.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/why.is.voc
new file mode 100644
index 000000000000..812fd69d6743
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/es-lm/why.is.voc
@@ -0,0 +1,5 @@
+por qué
+por qué
+por qué
+por qué
+por qué
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/question.dialog
new file mode 100644
index 000000000000..d5ce416b4b1e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/question.dialog
@@ -0,0 +1,4 @@
+Sentitzen dut, ezin dizut lagundu.
+Ez dakit oso ondo nola lagundu horrekin.
+Ez dut ulertu, baina egunero ikasten ditut gauza berriak.
+Ez dakit nola erantzun horri.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/question.voc
new file mode 100644
index 000000000000..55430bb951ec
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/question.voc
@@ -0,0 +1,13 @@
+zer da|zer
+zer egingo du|zer
+zer egin zuen|zer
+zer egiten du|zer
+non dago|non
+non egingo du|non
+non
+noiz da|noiz
+noiz izango da|noiz
+non
+noiz
+noiz
+
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/unknown.dialog
new file mode 100644
index 000000000000..e9e4122c98a3
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/unknown.dialog
@@ -0,0 +1,8 @@
+Ez dut ulertu, baina egunero ikasten ditut gauza berriak.
+Sentitzen dut, ez dut ulertu.
+Ez dakit zer esan nahi duen horrek.
+Barkatu, ez dakit zer esan nahi duzun.
+Barkatuko didazu, ez dut tutik ere ulertu.
+Ez dut ulertu.
+Esan duzuna beste modu baten esaten saia zaitezke.
+Errepikatu esan duzuna, mesedez.
\ No newline at end of file
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/who.is.dialog
new file mode 100644
index 000000000000..f53e59a09ba2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/who.is.dialog
@@ -0,0 +1,2 @@
+Ez dakit hori nor den.
+Ez nago ziur badakidan hori nor den.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/who.is.voc
new file mode 100644
index 000000000000..42ba44e9958e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/who.is.voc
@@ -0,0 +1,3 @@
+(nor|zein) da
+(nor|zein) zen 
+(nor|zein) izan zen
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/why.is.dialog
new file mode 100644
index 000000000000..09fd419c393e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/why.is.dialog
@@ -0,0 +1,5 @@
+Ez daukat argi nola lagundu zaitzakedan horrekin.
+Ez dakit.
+Ez nago oso ziur.
+Ez nago ziur.
+Ez nago ziur, baina ikasteko nire esku dagoen guztia egiten dut.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/why.is.voc
new file mode 100644
index 000000000000..2f444b156e07
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/eu-eu/why.is.voc
@@ -0,0 +1 @@
+zergatik
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/question.dialog
new file mode 100644
index 000000000000..b0acf37aba16
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/question.dialog
@@ -0,0 +1,4 @@
+متاسفم من نمی تونم در این باره کمکی بکنم
+مطمئن نیستم بتونم در این باره کمکی بکنم
+متوجه نشدم، ولی من هر روز چیز های تازه یاد می گیرم
+نمی دونم چجوری باید جواب بدم
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/question.voc
new file mode 100644
index 000000000000..722e73101687
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/question.voc
@@ -0,0 +1,15 @@
+چیه
+چی خواهد شد
+چه شد
+چی می شه
+چه کار
+کجا
+کجا
+کجا
+کجا
+کجا
+کی
+چه وقتی
+چه زمانی
+چه وقتی
+چه وقتی
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/unknown.dialog
new file mode 100644
index 000000000000..8d7902571d9b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/unknown.dialog
@@ -0,0 +1,9 @@
+متوجه نشدم، ولی من هر روز چیز های تازه یاد می گیرم
+ببخشید، متوجه نشدم
+نمی دونم این چه معنی ای می ده
+ببخشید، نگرفتم
+ببخشید، نفهمیدم
+متوجه نشدم
+مطمئن نیستم درست فهمیده باشم
+می تونید به یه روش دیگه ای بگید
+لطفا درخواستتون رُ با یه عبارتِ دیگه ای بگید
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/who.is.dialog
new file mode 100644
index 000000000000..cda985f5f630
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/who.is.dialog
@@ -0,0 +1,2 @@
+من نمی دونم اون چه کسیه
+مطمئن نیستم اون چه کسیه
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/who.is.voc
new file mode 100644
index 000000000000..4ad1ee536b90
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/who.is.voc
@@ -0,0 +1,5 @@
+چه کسی
+چه کسی
+چه کسی
+چه کسی
+چه کسی
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/why.is.dialog
new file mode 100644
index 000000000000..f6c2493e4fc7
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/why.is.dialog
@@ -0,0 +1,5 @@
+مطمئن نیستم بتونم در این باره کمکی بکنم
+نمی دونم
+خیلی مطمئن نیستم
+مطمئن نیستم
+بلد نیستم، ولی بهترین تلاشم رو می کنم که یاد بگیرم.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/why.is.voc
new file mode 100644
index 000000000000..5c62e5daa1d4
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-fa/why.is.voc
@@ -0,0 +1,5 @@
+چرا
+چرا
+چرا
+چرا
+چرا
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/question.dialog
new file mode 100644
index 000000000000..b0acf37aba16
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/question.dialog
@@ -0,0 +1,4 @@
+متاسفم من نمی تونم در این باره کمکی بکنم
+مطمئن نیستم بتونم در این باره کمکی بکنم
+متوجه نشدم، ولی من هر روز چیز های تازه یاد می گیرم
+نمی دونم چجوری باید جواب بدم
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/question.voc
new file mode 100644
index 000000000000..722e73101687
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/question.voc
@@ -0,0 +1,15 @@
+چیه
+چی خواهد شد
+چه شد
+چی می شه
+چه کار
+کجا
+کجا
+کجا
+کجا
+کجا
+کی
+چه وقتی
+چه زمانی
+چه وقتی
+چه وقتی
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/unknown.dialog
new file mode 100644
index 000000000000..8d7902571d9b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/unknown.dialog
@@ -0,0 +1,9 @@
+متوجه نشدم، ولی من هر روز چیز های تازه یاد می گیرم
+ببخشید، متوجه نشدم
+نمی دونم این چه معنی ای می ده
+ببخشید، نگرفتم
+ببخشید، نفهمیدم
+متوجه نشدم
+مطمئن نیستم درست فهمیده باشم
+می تونید به یه روش دیگه ای بگید
+لطفا درخواستتون رُ با یه عبارتِ دیگه ای بگید
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/who.is.dialog
new file mode 100644
index 000000000000..cda985f5f630
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/who.is.dialog
@@ -0,0 +1,2 @@
+من نمی دونم اون چه کسیه
+مطمئن نیستم اون چه کسیه
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/who.is.voc
new file mode 100644
index 000000000000..4ad1ee536b90
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/who.is.voc
@@ -0,0 +1,5 @@
+چه کسی
+چه کسی
+چه کسی
+چه کسی
+چه کسی
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/why.is.dialog
new file mode 100644
index 000000000000..f6c2493e4fc7
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/why.is.dialog
@@ -0,0 +1,5 @@
+مطمئن نیستم بتونم در این باره کمکی بکنم
+نمی دونم
+خیلی مطمئن نیستم
+مطمئن نیستم
+بلد نیستم، ولی بهترین تلاشم رو می کنم که یاد بگیرم.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/why.is.voc
new file mode 100644
index 000000000000..5c62e5daa1d4
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fa-ir/why.is.voc
@@ -0,0 +1,5 @@
+چرا
+چرا
+چرا
+چرا
+چرا
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/question.dialog
new file mode 100644
index 000000000000..07e4bc690412
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/question.dialog
@@ -0,0 +1,4 @@
+Désolé, ((pour le moment|) ce n'est pas dans mes compétences|je ne peux pas vous aider pour ça).
+Je ne sais pas trop comment vous aider avec ça.
+Je ne comprends pas, mais j'apprends de nouvelles choses tous les jours.
+Je ne sais pas trop comment répondre à ça.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/question.voc
new file mode 100644
index 000000000000..6ab6b67c53fa
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/question.voc
@@ -0,0 +1,15 @@
+quel est
+quel sera
+quel était
+que fait
+que fait
+où est
+où sera
+où était
+où est-ce que
+où faire
+quand est
+quand sera
+quand était
+quand est-ce que
+quand faire
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/unknown.dialog
new file mode 100644
index 000000000000..f4ee281d971d
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/unknown.dialog
@@ -0,0 +1,9 @@
+Je ne comprends pas, mais j'apprends de nouvelles choses tous les jours.
+Je suis désolé, je ne comprends pas.
+Je ne sais pas ce que ça veut dire.
+Désolé, je n'ai pas compris.
+Désolé, je ne comprends pas.
+Je ne comprends pas.
+Je ne suis pas sûr de vous avoir compris.
+Vous devriez peut-être dire ça d'une autre façon.
+Merci de reformuler (la question|votre demande).
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/who.is.dialog
new file mode 100644
index 000000000000..65ea3fa998ca
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/who.is.dialog
@@ -0,0 +1,2 @@
+Je ne sais pas qui c'est.
+Je ne suis pas sûr de savoir qui c'est.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/who.is.voc
new file mode 100644
index 000000000000..d87878bc8d12
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/who.is.voc
@@ -0,0 +1,5 @@
+qui est
+qui sera
+qui était
+qui fait
+qui font
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/why.is.dialog
new file mode 100644
index 000000000000..2f953dd5cd79
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/why.is.dialog
@@ -0,0 +1,5 @@
+Je ne sais pas trop comment vous aider avec ça.
+Je ne sais pas.
+Je ne suis pas tout à fait sûr.
+Je ne suis pas sûr.
+Je ne suis pas sûr, mais je fais de mon mieux pour apprendre.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/why.is.voc
new file mode 100644
index 000000000000..020bc2e5f73b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/fr-fr/why.is.voc
@@ -0,0 +1,5 @@
+pourquoi est ce que
+pourquoi sera
+pourquoi
+pourquoi
+pourquoi faire
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/question.dialog
new file mode 100644
index 000000000000..1b3e3f1f3faa
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/question.dialog
@@ -0,0 +1,4 @@
+Síntoo moito, eu non che podo axudar con isto.
+Non sei con axudarche con isto.
+Eu non te entendo, mais estou aprendendo cousas novas todos os días.
+Non sei como responder a iso.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/question.voc
new file mode 100644
index 000000000000..b7b72b71f2b0
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/question.voc
@@ -0,0 +1,15 @@
+que é
+que irá
+que
+que
+que
+onde está
+onde irá
+onde fixo
+onde
+onde
+cando é
+cando será
+cando
+cando
+cando
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/unknown.dialog
new file mode 100644
index 000000000000..c77d30191480
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/unknown.dialog
@@ -0,0 +1,9 @@
+Eu non te entendo, mais estou aprendendo cousas novas todos os días.
+Descúlpame, eu non entendo.
+Non sei o que significa iso.
+Desculpa, eu non entendín iso.
+Desculpa, non entendín.
+Non o entendín.
+Non estou seguro de se te entendín.
+Podes dicir iso dunha maneira diferente.
+Por favor, reformula a túa petición.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/who.is.dialog
new file mode 100644
index 000000000000..5bb81fb83c4b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/who.is.dialog
@@ -0,0 +1,2 @@
+Non sei quen es.
+Non estou seguro de quen es.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/who.is.voc
new file mode 100644
index 000000000000..75f5f4904795
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/who.is.voc
@@ -0,0 +1,5 @@
+quen é
+quen será
+quen
+quen
+quen
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/why.is.dialog
new file mode 100644
index 000000000000..4d2333a2cbf2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/why.is.dialog
@@ -0,0 +1,5 @@
+Non sei con axudarche con isto.
+Non o sei.
+Non estou tan seguro.
+Non estou seguro.
+Non estou seguro, mais estou dando o meu máximo para seguir aprendendo.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/why.is.voc
new file mode 100644
index 000000000000..9cb794dbc75b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/gl-es/why.is.voc
@@ -0,0 +1,5 @@
+por que é
+por que será
+por que
+por que
+por que
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/question.dialog
new file mode 100644
index 000000000000..b1f55a236fab
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/question.dialog
@@ -0,0 +1,4 @@
+Sajnálom, ebben nem segíthetek.
+Nem tudom hogyan segíthetnék ebben.
+Ezt nem értem, de minden nap tanulok valami újat.
+Nem tudom mit lehet válaszolni erre.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/question.voc
new file mode 100644
index 000000000000..83dd7dbbede5
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/question.voc
@@ -0,0 +1,15 @@
+mi (van|a|az)
+mi (lesz|fog)
+mit (tett|csinált)
+mit (tesz|csinál)
+mit (tesznek|csinálnak)
+hol (van|a|az)
+hol (lesz|lesznek|fog|fognak)
+hol (volt|csinált|csinálta|tette)
+hol (tesz|csinál)
+hol (tesznek|csinálnak)
+mikor van
+mikor (lesz|fog)
+mikor (volt|tette|csinálta)
+mikor (tesz|csinál)
+mikor (tesznek|csinálnak)
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/unknown.dialog
new file mode 100644
index 000000000000..c73796ce99cc
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/unknown.dialog
@@ -0,0 +1,9 @@
+Ezt nem értem, de minden nap tanulok valami újat.
+Sajnálom, nem értem.
+Nem tudom hogy ez mit jelent.
+Sajnos ez nem világos nekem.
+Sajnos ezt nem értem.
+Nem értem.
+Nem biztos hogy jól értelek.
+Mondd ezt másképpen!
+Kérlek ezt fogalmazd át!
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/who.is.dialog
new file mode 100644
index 000000000000..2b92c11b8099
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/who.is.dialog
@@ -0,0 +1,2 @@
+Nem tudom hogy ki az.
+Nem igazán tudom hogy ki az.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/who.is.voc
new file mode 100644
index 000000000000..dd2d56863a3c
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/who.is.voc
@@ -0,0 +1,5 @@
+ki (a|az)
+ki (lesz|fog)
+ki (volt|tette|csinálta)
+ki (tesz|csinál)
+kik (tesznek|csinálnak)
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/why.is.dialog
new file mode 100644
index 000000000000..f01363e92fa6
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/why.is.dialog
@@ -0,0 +1,5 @@
+Nem tudom hogyan segíthetnék ebben.
+Nem tudom.
+Nem igazán tudom.
+Nem vagyok biztos benne.
+Nem vagyok biztos benne, de igyekszem tanulni.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/why.is.voc
new file mode 100644
index 000000000000..67d4898b0b14
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/hu-hu/why.is.voc
@@ -0,0 +1,5 @@
+miért van
+miért (lesz|fog)
+miért (volt|tett|tette|csinált|csinálta)
+miért (tesz|csinál)
+miért (tesznek|csinálnak)
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/question.dialog
new file mode 100644
index 000000000000..53074ce733eb
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/question.dialog
@@ -0,0 +1,4 @@
+Mi dispiace ma non posso aiutarti con questa cosa.
+Non sono sicuro di poterti aiutare qui.
+Non capisco, ma imparo nuove cose tutti i giorni.
+Non so come risponderti.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/question.voc
new file mode 100644
index 000000000000..f207de5f0442
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/question.voc
@@ -0,0 +1,15 @@
+che cos'è
+cosa sarà
+cosa ha fatto
+cosa fa
+cosa fare
+dove si trova
+dove sarà
+(dove è|dov'è) stato
+dove va
+dove
+quando è
+quando
+quando è (successo|successa|stato|stata)
+quando lo fa
+quando fai
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/unknown.dialog
new file mode 100644
index 000000000000..1dc387873b94
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/unknown.dialog
@@ -0,0 +1,9 @@
+Non capisco, ma imparo nuove cose tutti i giorni.
+Mi spiace ma non capisco.
+Non so cosa significa quello che hai detto.
+Mi spiace, ma non ho capito.
+Non ho capito.
+Non capisco.
+Non credo di aver capito.
+Forse puoi ridirlo in un modo diverso.
+Per piacere, usa un'altra frase per fare la tua richiesta.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/who.is.dialog
new file mode 100644
index 000000000000..f8cf04081f59
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/who.is.dialog
@@ -0,0 +1,2 @@
+Non so chi sia.
+Non sono sicuro di chi sia.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/who.is.voc
new file mode 100644
index 000000000000..ff868b166bda
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/who.is.voc
@@ -0,0 +1,5 @@
+chi è
+chi lo farà
+chi ha fatto
+chi fa
+chi (lo|la) fa
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/why.is.dialog
new file mode 100644
index 000000000000..36b225d33811
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/why.is.dialog
@@ -0,0 +1,5 @@
+Non sono sicuro di poterti aiutare qui.
+Non so.
+Non sono proprio sicuro.
+Non sono sicuro.
+Non sono sicuro, ma faccio del mio meglio per imparare.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/why.is.voc
new file mode 100644
index 000000000000..57d586cfad25
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/it-it/why.is.voc
@@ -0,0 +1,5 @@
+perché è
+perché lo farà
+perché lo ha fatto
+perché lo fa
+perché fare
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/question.dialog
new file mode 100644
index 000000000000..886c51736215
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/question.dialog
@@ -0,0 +1,4 @@
+Sorry, daar kan ik je niet mee helpen.
+Ik weet niet goed hoe ik je daarbij kan helpen.
+Ik begrijp dit niet, maar leer er wel elke dag wat bij.
+Daar weet ik geen goed antwoord op.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/question.voc
new file mode 100644
index 000000000000..997e726917f2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/question.voc
@@ -0,0 +1,15 @@
+wat is
+wat zal
+wat deed
+wat doet
+wat doe
+waar is
+waar zal
+waar is
+waar is
+waar
+wanneer is
+wanneer zal
+wanneer is
+wanneer doet
+wanneer doe
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/unknown.dialog
new file mode 100644
index 000000000000..e597568a3fed
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/unknown.dialog
@@ -0,0 +1,9 @@
+Ik begrijp dit niet, maar leer er wel elke dag wat bij.
+Excuseer me, ik begrijp het niet.
+Ik weet niet wat dat betekent.
+Excuseer me, dat kreeg ik niet mee.
+Excuseer me, ik begrijp het niet.
+Ik begrijp het niet.
+Ik aarzel of ik je begrepen heb.
+Kun je dat nog eens anders zeggen?
+Kun je dat op een andere manier vragen?
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/who.is.dialog
new file mode 100644
index 000000000000..e5bf89277a4d
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/who.is.dialog
@@ -0,0 +1,2 @@
+Ik weet niet wie dat is.
+Ik weet niet zeker wie dat is.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/who.is.voc
new file mode 100644
index 000000000000..7bff8c8d21bd
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/who.is.voc
@@ -0,0 +1,5 @@
+wie is
+wie zal
+wie deed
+wie doet
+wie doen
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/why.is.dialog
new file mode 100644
index 000000000000..f9ab1b089772
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/why.is.dialog
@@ -0,0 +1,5 @@
+Ik weet niet goed hoe ik je daarbij kan helpen.
+Ik weet het niet.
+Ik ben er niet echt zeker van.
+Ik weet het niet zeker.
+Ik weet het niet zeker, en ik doe m'n best om erbij te leren.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/why.is.voc
new file mode 100644
index 000000000000..4e4145b04601
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/nl-nl/why.is.voc
@@ -0,0 +1,5 @@
+waarom is
+waarom zal
+waarom deed
+waarom doet
+waarom 
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/question.dialog
new file mode 100644
index 000000000000..0279aab23c12
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/question.dialog
@@ -0,0 +1,4 @@
+Przepraszam, nie mogę Ci z tym pomóc.
+Nie jestem pewien jak Ci z tym pomóc.
+Nie rozumiem, ale każdego dnia uczę się nowych rzeczy.
+Nie jestem pewien jak na to odpowiedzieć.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/question.voc
new file mode 100644
index 000000000000..b0cb40c3abfb
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/question.voc
@@ -0,0 +1,15 @@
+co jest
+co będzie
+co zrobiłem
+co robi
+co robić
+gdzie jest
+gdzie będzie
+gdzie zrobił
+gdzie robi
+gdzie robić
+kiedy jest
+kiedy będzie
+kiedy zrobił
+kiedy robi
+kiedy zrobić
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/unknown.dialog
new file mode 100644
index 000000000000..07a50f1eee3a
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/unknown.dialog
@@ -0,0 +1,9 @@
+Nie rozumiem, ale każdego dnia uczę się nowych rzeczy.
+Przepraszam, nie rozumiem.
+Nie wiem co to znaczy.
+Przepraszam, nie załapałem tego.
+Przepraszam nie rozumiem.
+Nie rozumiem.
+Nie jestem pewien czy Cię zrozumiałem.
+Spróbuj powiedzieć to w inny sposób.
+Powtórz swoje polecenie używając innych słów.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/who.is.dialog
new file mode 100644
index 000000000000..cc478db0b855
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/who.is.dialog
@@ -0,0 +1,2 @@
+Nie wiem kto to jest.
+Nie jestem pewien kto to jest.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/who.is.voc
new file mode 100644
index 000000000000..6f569774ac07
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/who.is.voc
@@ -0,0 +1,5 @@
+kim jest
+kim będzie
+kto zrobił
+kto robi
+kto to robi
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/why.is.dialog
new file mode 100644
index 000000000000..3d0510161d69
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/why.is.dialog
@@ -0,0 +1,5 @@
+Nie jestem pewien jak Ci z tym pomóc.
+Nie wiem
+Nie jestem do końca pewien.
+Nie jestem pewien.
+Nie jestem pewien, ale robię co mogę by się uczyć.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/why.is.voc
new file mode 100644
index 000000000000..4cfc31700e8f
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pl-pl/why.is.voc
@@ -0,0 +1,5 @@
+dlaczego jest
+dlaczego będzie
+dlaczego zrobił
+dlaczego
+dlaczego
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/question.dialog
new file mode 100644
index 000000000000..cc00799e5001
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/question.dialog
@@ -0,0 +1,4 @@
+Me desculpe, eu não posso te ajudar com isso.
+Não sei como te ajudar com isso.
+Eu não entendo, mas estou aprendendo coisas novas todos os dias.
+Não sei como responder isso.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/question.voc
new file mode 100644
index 000000000000..af0095ccd4e3
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/question.voc
@@ -0,0 +1,15 @@
+o que é
+o que irá
+o que
+o que
+fazer o que
+Onde é
+onde vai
+onde fez
+onde
+onde
+Quando é
+quando será
+quando fez
+quando faz
+quando fazer
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/unknown.dialog
new file mode 100644
index 000000000000..1bf0df1ace72
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/unknown.dialog
@@ -0,0 +1,9 @@
+Eu não entendo, mas estou aprendendo coisas novas todos os dias.
+Me desculpe, eu não entendo..
+Eu não sei o que isso significa.
+Desculpe, eu não entendi isso.
+Desculpe, não entendi.
+Eu não entendo
+Não tenho certeza se entendi você.
+Você pode ter que dizer isso de uma maneira diferente.
+Por favor, reformule o seu pedido
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/who.is.dialog
new file mode 100644
index 000000000000..d2a505de8d26
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/who.is.dialog
@@ -0,0 +1,2 @@
+Eu não sei quem é.
+Não tenho certeza de quem é.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/who.is.voc
new file mode 100644
index 000000000000..cfff23830cad
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/who.is.voc
@@ -0,0 +1,5 @@
+quem é
+quem vai
+quem fez
+quem fez
+Quem faz
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/why.is.dialog
new file mode 100644
index 000000000000..8c18eed95d81
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/why.is.dialog
@@ -0,0 +1,5 @@
+Não sei como te ajudar com isso.
+Eu não sei.
+Eu não tenho tanta certeza.
+Não tenho certeza.
+Não tenho certeza, mas estou fazendo o meu melhor para aprender.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/why.is.voc
new file mode 100644
index 000000000000..d27c0ceabf70
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/pt-br/why.is.voc
@@ -0,0 +1,5 @@
+porque é
+porque vai
+porque
+porque
+por que
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/question.dialog
new file mode 100644
index 000000000000..72246df6fad9
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/question.dialog
@@ -0,0 +1,4 @@
+Îmi pare rău că nu te pot ajuta cu asta.
+Nu sunt sigur cum să te ajut cu asta.
+Nu înțeleg, dar învăț lucruri noi în fiecare zi.
+Nu sunt sigur cum să răspund.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/question.voc
new file mode 100644
index 000000000000..fa1fd7e85429
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/question.voc
@@ -0,0 +1,15 @@
+ce este
+ce va
+ce a făcut
+ce face
+ce fac
+unde este
+unde vor
+unde a făcut-o
+unde se întâmplă
+unde se face
+cand este
+cand va
+când a făcut
+cand
+când
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/unknown.dialog
new file mode 100644
index 000000000000..342dc22b3821
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/unknown.dialog
@@ -0,0 +1,9 @@
+Nu înțeleg, dar învăț lucruri noi în fiecare zi.
+Îmi pare rău, nu înțeleg.
+Nu știu ce înseamnă asta.
+Scuze, nu am prins asta.
+Îmi pare rău, nu înțeleg.
+Nu înțeleg.
+Nu sunt sigur că te-am înțeles.
+Ai putea încerca să spui în mod diferit.
+Vă rugăm să reformulați cererea dvs.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/who.is.dialog
new file mode 100644
index 000000000000..3e33646abab8
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/who.is.dialog
@@ -0,0 +1,2 @@
+Nu știu cine este.
+Nu sunt sigur cine este.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/who.is.voc
new file mode 100644
index 000000000000..fd9c6e4781fb
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/who.is.voc
@@ -0,0 +1,5 @@
+cine este
+cine va
+cine a facut
+cine
+care fac
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/why.is.dialog
new file mode 100644
index 000000000000..8d1d51638cfe
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/why.is.dialog
@@ -0,0 +1,5 @@
+Nu sunt sigur cum să te ajut cu asta.
+Nu știu.
+Nu sunt chiar sigur.
+Nu sunt sigur.
+Nu sunt sigur, dar fac tot ce pot pentru a învăța.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/why.is.voc
new file mode 100644
index 000000000000..b9f99e49425a
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ro-ro/why.is.voc
@@ -0,0 +1,5 @@
+de ce este
+de ce va
+de ce a făcut
+de ce
+de ce face
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/question.dialog
new file mode 100644
index 000000000000..2b97830198d6
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/question.dialog
@@ -0,0 +1,4 @@
+Извините, я не могу вам с этим помочь.
+Я не знаю, как вам помочь с этим.
+Я не понимаю, но я изучаю новые вещи каждый день.
+Я не знаю, как на это ответить.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/question.voc
new file mode 100644
index 000000000000..709838b8a3ee
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/question.voc
@@ -0,0 +1,15 @@
+что
+что
+что
+что
+что
+где
+Где будет
+где
+Откуда
+где
+когда
+когда
+когда
+когда
+когда
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/unknown.dialog
new file mode 100644
index 000000000000..6d82028bd779
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/unknown.dialog
@@ -0,0 +1,9 @@
+Я не понимаю, но я изучаю новые вещи каждый день.
+Извините, я не понимаю.
+Я не знаю, что это значит.
+Извините, я не улавливаю.
+Извините, я не понимаю.
+Я не понимаю.
+Не могу утверждать, что понимаю вас.
+Попробуйте сказать это иначе.
+Пожалуйста, перефразируйте ваш запрос
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/who.is.dialog
new file mode 100644
index 000000000000..19594a508a09
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/who.is.dialog
@@ -0,0 +1,2 @@
+Я не знаю, кто это.
+Я не уверен, кто это.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/who.is.voc
new file mode 100644
index 000000000000..810c19b11920
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/who.is.voc
@@ -0,0 +1,5 @@
+кто
+кто
+кто
+кто
+кто
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/why.is.dialog
new file mode 100644
index 000000000000..9e52b02acde2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/why.is.dialog
@@ -0,0 +1,5 @@
+Я не знаю, как вам помочь с этим.
+Я не знаю.
+Я не совсем уверен.
+Я не уверен.
+Я не уверен, но я постараюсь научиться.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/why.is.voc
new file mode 100644
index 000000000000..225477f26f6f
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/ru-ru/why.is.voc
@@ -0,0 +1,5 @@
+почему
+почему
+почему
+почему
+почему
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/question.dialog
new file mode 100644
index 000000000000..b5f97388c02e
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/question.dialog
@@ -0,0 +1,4 @@
+Jag är ledsen men jag kan inte hjälpa till med detta.
+Jag är osäker på hur jag ska hjälpa dig med det där.
+Jag förstår inte, men jag lär mig nya saker varje dag.
+Jag kan inte svara på det.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/question.voc
new file mode 100644
index 000000000000..7b14290deb8d
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/question.voc
@@ -0,0 +1,15 @@
+vad är
+vad kommer
+vad gjorde
+vad gör
+what gör
+var är
+var kommer
+var gjorde
+var hände
+var gör
+när är
+när kommer
+när hände
+när gör
+när gör
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/unknown.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/unknown.dialog
new file mode 100644
index 000000000000..825b44b14e19
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/unknown.dialog
@@ -0,0 +1,9 @@
+Jag förstår inte, men jag lär mig nya saker varje dag.
+Jag är ledsen, jag förstår inte.
+Jag förstår inte vad det innebär.
+Ursäkta, Jag uppfattade inte riktigt det där.
+Jag är ledsen, jag förstår inte.
+Jag förstår inte.
+Jag förstod dig nog inte.
+Du kanske kan säga det där på ett annat sätt.
+Skulle du kunna omformulera din förfrågan.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/who.is.dialog
new file mode 100644
index 000000000000..09821fcfcc7d
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/who.is.dialog
@@ -0,0 +1,2 @@
+Jag vet inte vem det är.
+Jag är osäker på vem det är.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/who.is.voc
new file mode 100644
index 000000000000..77502675ba1c
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/who.is.voc
@@ -0,0 +1,5 @@
+vem är
+vem kommer
+vem gjorde
+vem gör
+vem gör
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/why.is.dialog
new file mode 100644
index 000000000000..120ae7cf2e1b
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/why.is.dialog
@@ -0,0 +1,5 @@
+Jag är osäker på hur jag ska hjälpa dig med det där.
+Jag vet inte.
+Jag är lite osäker.
+Jag är osäker.
+Jag vet inte, men jag gör mitt bästa för att lära mig.
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/why.is.voc
new file mode 100644
index 000000000000..e059f6902fd0
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/locale/sv-se/why.is.voc
@@ -0,0 +1,5 @@
+varför är
+varför kommer
+varför gjorde
+varför gör
+varför
diff --git a/test/end2end/session/skill-ovos-fallback-unknown/setup.py b/test/end2end/session/skill-ovos-fallback-unknown/setup.py
new file mode 100755
index 000000000000..3ff59d18ffd2
--- /dev/null
+++ b/test/end2end/session/skill-ovos-fallback-unknown/setup.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+from setuptools import setup
+from os import walk, path
+
+URL = "https://github.com/OpenVoiceOS/skill-ovos-fallback-unknown"
+SKILL_CLAZZ = "UnknownSkill"  # needs to match __init__.py class name
+PYPI_NAME = "ovos-skill-fallback-unknown"  # pip install PYPI_NAME
+
+# below derived from github url to ensure standard skill_id
+SKILL_AUTHOR, SKILL_NAME = URL.split(".com/")[-1].split("/")
+SKILL_PKG = SKILL_NAME.lower().replace('-', '_')
+PLUGIN_ENTRY_POINT = f'{SKILL_NAME.lower()}.{SKILL_AUTHOR.lower()}={SKILL_PKG}:{SKILL_CLAZZ}'
+# skill_id=package_name:SkillClass
+
+
+def find_resource_files():
+    resource_base_dirs = ("locale", "ui", "vocab", "dialog", "regex", "skill")
+    base_dir = path.dirname(__file__)
+    package_data = ["*.json"]
+    for res in resource_base_dirs:
+        if path.isdir(path.join(base_dir, res)):
+            for (directory, _, files) in walk(path.join(base_dir, res)):
+                if files:
+                    package_data.append(
+                        path.join(directory.replace(base_dir, "").lstrip('/'),
+                                  '*'))
+    return package_data
+
+
+setup(
+    name=PYPI_NAME,
+    version="0.0.0",
+    package_dir={SKILL_PKG: ""},
+    package_data={SKILL_PKG: find_resource_files()},
+    packages=[SKILL_PKG],
+    include_package_data=True,
+    keywords='ovos skill plugin',
+    entry_points={'ovos.plugin.skill': PLUGIN_ENTRY_POINT}
+)
diff --git a/test/end2end/session/test_fallback.py b/test/end2end/session/test_fallback.py
new file mode 100644
index 000000000000..03b70fa6bafa
--- /dev/null
+++ b/test/end2end/session/test_fallback.py
@@ -0,0 +1,183 @@
+from time import sleep
+from unittest import TestCase
+
+from ovos_bus_client.message import Message
+from ovos_bus_client.session import SessionManager, Session
+from ovos_core.intent_services import IntentService
+from ovos_core.skill_manager import SkillManager
+from ovos_plugin_manager.skills import find_skill_plugins
+from ovos_utils.log import LOG
+from ovos_utils.messagebus import FakeBus
+from ovos_utils.process_utils import ProcessState
+from ovos_workshop.skills.fallback import FallbackSkill
+
+
+class MiniCroft(SkillManager):
+    def __init__(self, skill_ids, *args, **kwargs):
+        bus = FakeBus()
+        super().__init__(bus, *args, **kwargs)
+        self.skill_ids = skill_ids
+        self.intent_service = self._register_intent_services()
+
+    def _register_intent_services(self):
+        """Start up the all intent services and connect them as needed.
+
+        Args:
+            bus: messagebus client to register the services on
+        """
+        service = IntentService(self.bus)
+        # Register handler to trigger fallback system
+        self.bus.on(
+            'mycroft.skills.fallback',
+            FallbackSkill.make_intent_failure_handler(self.bus)
+        )
+        return service
+
+    def load_plugin_skills(self):
+        LOG.info("loading skill plugins")
+        plugins = find_skill_plugins()
+        for skill_id, plug in plugins.items():
+            LOG.debug(skill_id)
+            if skill_id not in self.skill_ids:
+                continue
+            if skill_id not in self.plugin_skills:
+                self._load_plugin_skill(skill_id, plug)
+
+    def run(self):
+        """Load skills and update periodically from disk and internet."""
+        self.status.set_alive()
+
+        self.load_plugin_skills()
+
+        self.status.set_ready()
+
+        LOG.info("Skills all loaded!")
+
+    def stop(self):
+        super().stop()
+        SessionManager.bus = None
+        SessionManager.sessions = {}
+        SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
+
+
+def get_minicroft(skill_id):
+    croft1 = MiniCroft([skill_id])
+    croft1.start()
+    while croft1.status.state != ProcessState.READY:
+        sleep(0.2)
+    return croft1
+
+
+class TestSessions(TestCase):
+
+    def setUp(self):
+        self.skill_id = "skill-ovos-fallback-unknown.openvoiceos"
+        self.core = get_minicroft(self.skill_id)
+
+    def test_complete_failure(self):
+        SessionManager.sessions = {}
+        SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
+        SessionManager.default_session.lang = "en-us"
+        messages = []
+
+        def new_msg(msg):
+            nonlocal messages
+            m = Message.deserialize(msg)
+            if m.msg_type in ["ovos.skills.settings_changed"]:
+                return  # skip these, only happen in 1st run
+            messages.append(m)
+            print(len(messages), msg)
+
+        def wait_for_n_messages(n):
+            nonlocal messages
+            while len(messages) < n:
+                sleep(0.1)
+
+        self.core.bus.on("message", new_msg)
+
+        utt = Message("recognizer_loop:utterance",
+                      {"utterances": ["invalid"]},
+                      {"session": SessionManager.default_session.serialize()})
+        self.core.bus.emit(utt)
+
+        # confirm all expected messages are sent
+        expected_messages = [
+            "recognizer_loop:utterance",
+            "skill.converse.ping",
+            "skill.converse.pong",
+            "ovos.skills.fallback.ping",
+            "ovos.skills.fallback.pong",
+            f"ovos.skills.fallback.{self.skill_id}.request",
+            f"ovos.skills.fallback.{self.skill_id}.start",
+            "enclosure.active_skill",
+            "speak",
+            f"ovos.skills.fallback.{self.skill_id}.response",
+            "intent.service.skills.activated",
+            f"{self.skill_id}.activate",
+            "ovos.session.update_default"
+        ]
+        wait_for_n_messages(len(expected_messages))
+
+        self.assertEqual(len(expected_messages), len(messages))
+
+        mtypes = [m.msg_type for m in messages]
+        for m in expected_messages:
+            self.assertTrue(m in mtypes)
+
+        # verify that contexts are kept around
+        for m in messages:
+            self.assertEqual(m.context["session"]["session_id"], "default")
+
+        # verify converse ping/pong answer from skill
+        self.assertEqual(messages[1].msg_type, "skill.converse.ping")
+        self.assertEqual(messages[2].msg_type, "skill.converse.pong")
+        self.assertEqual(messages[2].data["skill_id"], self.skill_id)
+        self.assertEqual(messages[2].context["skill_id"], self.skill_id)
+        self.assertFalse(messages[2].data["can_handle"])
+
+        # verify fallback ping/pong answer from skill
+        self.assertEqual(messages[3].msg_type, "ovos.skills.fallback.ping")
+        self.assertEqual(messages[4].msg_type, "ovos.skills.fallback.pong")
+        self.assertEqual(messages[4].data["skill_id"], self.skill_id)
+        self.assertEqual(messages[4].context["skill_id"], self.skill_id)
+        self.assertTrue(messages[4].data["can_handle"])
+
+        return
+        # high prio fallback
+        self.assertEqual(messages[3].msg_type, "mycroft.skills.fallback")
+        self.assertEqual(messages[3].data["fallback_range"], [0, 5])
+        self.assertEqual(messages[4].msg_type, "mycroft.skill.handler.start")
+        self.assertEqual(messages[4].data["handler"], "fallback")
+        self.assertEqual(messages[5].msg_type, "mycroft.skill.handler.complete")
+        self.assertEqual(messages[5].data["handler"], "fallback")
+        self.assertEqual(messages[6].msg_type, "mycroft.skills.fallback.response")
+        self.assertFalse(messages[6].data["handled"])
+
+        # medium prio fallback
+        self.assertEqual(messages[7].msg_type, "mycroft.skills.fallback")
+        self.assertEqual(messages[7].data["fallback_range"], [5, 90])
+        self.assertEqual(messages[8].msg_type, "mycroft.skill.handler.start")
+        self.assertEqual(messages[8].data["handler"], "fallback")
+        self.assertEqual(messages[9].msg_type, "mycroft.skill.handler.complete")
+        self.assertEqual(messages[9].data["handler"], "fallback")
+        self.assertEqual(messages[10].msg_type, "mycroft.skills.fallback.response")
+        self.assertFalse(messages[10].data["handled"])
+
+        # low prio fallback
+        self.assertEqual(messages[11].msg_type, "mycroft.skills.fallback")
+        self.assertEqual(messages[11].data["fallback_range"], [90, 101])
+        self.assertEqual(messages[12].msg_type, "mycroft.skill.handler.start")
+        self.assertEqual(messages[12].data["handler"], "fallback")
+        self.assertEqual(messages[13].msg_type, "mycroft.skill.handler.complete")
+        self.assertEqual(messages[13].data["handler"], "fallback")
+        self.assertEqual(messages[14].msg_type, "mycroft.skills.fallback.response")
+        self.assertFalse(messages[14].data["handled"])
+
+        # complete intent failure
+        self.assertEqual(messages[15].msg_type, "mycroft.audio.play_sound")
+        self.assertEqual(messages[15].data["uri"], "snd/error.mp3")
+        self.assertEqual(messages[16].msg_type, "complete_intent_failure")
+
+        # verify default session is now updated
+        self.assertEqual(messages[17].msg_type, "ovos.session.update_default")
+        self.assertEqual(messages[17].data["session_data"]["session_id"], "default")