diff --git a/ovos_core/intent_services/__init__.py b/ovos_core/intent_services/__init__.py
index 048c1c103de7..36ce93ba9f61 100644
--- a/ovos_core/intent_services/__init__.py
+++ b/ovos_core/intent_services/__init__.py
@@ -36,7 +36,7 @@
 # skill_id: the skill this handler belongs to
 IntentMatch = namedtuple('IntentMatch',
                          ['intent_service', 'intent_type',
-                          'intent_data', 'skill_id']
+                          'intent_data', 'skill_id', 'utterance']
                          )
 
 
@@ -264,6 +264,8 @@ def handle_utterance(self, message):
                     if match:
                         break
             if match:
+                message.data["utterance"] = match.utterance
+
                 if match.skill_id:
                     self.converse.activate_skill(match.skill_id)
                     # If the service didn't report back the skill_id it
diff --git a/ovos_core/intent_services/adapt_service.py b/ovos_core/intent_services/adapt_service.py
index b59d795bf50b..ff371d219721 100644
--- a/ovos_core/intent_services/adapt_service.py
+++ b/ovos_core/intent_services/adapt_service.py
@@ -247,7 +247,8 @@ def take_best(intent, utt):
             self.update_context(best_intent)
             skill_id = best_intent['intent_type'].split(":")[0]
             ret = ovos_core.intent_services.IntentMatch(
-                'Adapt', best_intent['intent_type'], best_intent, skill_id
+                'Adapt', best_intent['intent_type'], best_intent, skill_id,
+                best_intent['utterance']
             )
         else:
             ret = None
diff --git a/ovos_core/intent_services/commonqa_service.py b/ovos_core/intent_services/commonqa_service.py
index 9a826ffcc6dd..a02acadb832a 100644
--- a/ovos_core/intent_services/commonqa_service.py
+++ b/ovos_core/intent_services/commonqa_service.py
@@ -104,7 +104,7 @@ def match(self, utterances, lang, message):
                 message.data["utterance"] = utterance
                 answered = self.handle_question(message)
                 if answered:
-                    match = ovos_core.intent_services.IntentMatch('CommonQuery', None, {}, None)
+                    match = ovos_core.intent_services.IntentMatch('CommonQuery', None, {}, None, utterance)
                 break
         return match
 
diff --git a/ovos_core/intent_services/converse_service.py b/ovos_core/intent_services/converse_service.py
index ba0d4918f048..bdac97671962 100644
--- a/ovos_core/intent_services/converse_service.py
+++ b/ovos_core/intent_services/converse_service.py
@@ -259,5 +259,5 @@ def converse_with_skills(self, utterances, lang, message):
         # check if any skill wants to handle utterance
         for skill_id in self._collect_converse_skills():
             if self.converse(utterances, skill_id, lang, message):
-                return ovos_core.intent_services.IntentMatch('Converse', None, None, skill_id)
+                return ovos_core.intent_services.IntentMatch('Converse', None, None, skill_id, utterances[0])
         return None
diff --git a/ovos_core/intent_services/fallback_service.py b/ovos_core/intent_services/fallback_service.py
index 29c65025b6f9..baac1ded0615 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)
+                return ovos_core.intent_services.IntentMatch('Fallback', None, {}, None, utterances[0])
 
         # old style deprecated fallback skill singleton class
         LOG.debug("checking for FallbackSkillsV1")
@@ -178,7 +178,7 @@ def _fallback_range(self, utterances, lang, message, fb_range):
         response = self.bus.wait_for_response(msg, timeout=10)
 
         if response and response.data['handled']:
-            return ovos_core.intent_services.IntentMatch('Fallback', None, {}, None)
+            return ovos_core.intent_services.IntentMatch('Fallback', None, {}, None, utterances[0])
         return None
 
     def high_prio(self, utterances, lang, message):
diff --git a/ovos_core/intent_services/padatious_service.py b/ovos_core/intent_services/padatious_service.py
index 5c220aab7cc8..32882acca21e 100644
--- a/ovos_core/intent_services/padatious_service.py
+++ b/ovos_core/intent_services/padatious_service.py
@@ -94,7 +94,7 @@ def _match_level(self, utterances, limit, lang=None):
             skill_id = padatious_intent.name.split(':')[0]
             return ovos_core.intent_services.IntentMatch(
                 'Padatious', padatious_intent.name,
-                padatious_intent.matches, skill_id)
+                padatious_intent.matches, skill_id, padatious_intent.sent)
 
     def match_high(self, utterances, lang=None, message=None):
         """Intent matcher for high confidence.
@@ -324,10 +324,11 @@ def calc_intent(self, utterances: List[str], lang: str = None) -> Optional[Padat
                     pool.close()
                     pool.join()
             else:
-                intents = (_calc_padatious_intent(utt, intent_container) for utt in utterances)
+                intents = [_calc_padatious_intent(utt, intent_container) for utt in utterances]
 
             # select best
-            return max(intents, key=lambda k: k.conf)
+            if intents:
+                return max(intents, key=lambda k: k.conf)
 
 
 @lru_cache(maxsize=10)  # repeat calls under different conf levels wont re-run code
@@ -351,9 +352,7 @@ def _calc_padatious_intent(*args) -> \
             intent = PadatiousIntent(**intent)
         else:
             intent.sent = utt
-        # TODO: This is for backwards-compat. but means that an
-        #   entity "utterance" will be overridden
-        intent.matches['utterance'] = utt
+
         return intent
     except Exception as e:
         LOG.error(e)
diff --git a/test/integrationtests/test_selene_api.py b/test/integrationtests/test_selene_api.py
deleted file mode 100644
index 1e5d70a471c2..000000000000
--- a/test/integrationtests/test_selene_api.py
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 2017 Mycroft AI Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-import unittest
-import ovos_backend_client
-from ovos_backend_client.backends import BackendType
-import ovos_backend_client.backends
-import ovos_backend_client.pairing
-from unittest.mock import MagicMock, patch
-
-ovos_backend_client.backends.base.requests.post = MagicMock()
-
-
-def create_identity(uuid, expired=False):
-    mock_identity = MagicMock()
-    mock_identity.is_expired.return_value = expired
-    mock_identity.uuid = uuid
-    return mock_identity
-
-
-def create_response(status, json=None, url='', data=''):
-    json = json or {}
-    response = MagicMock()
-    response.status_code = status
-    response.json.return_value = json
-    response.url = url
-    return response
-
-
-class TestDeviceApi(unittest.TestCase):
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.request')
-    def test_init(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200)
-        mock_identity_get.return_value = create_identity('1234')
-
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        self.assertEqual(device.identity.uuid, '1234')
-        self.assertTrue(device.url.endswith("/device"))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.post')
-    def test_device_activate(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200)
-        mock_identity_get.return_value = create_identity('1234')
-        # Test activate
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.activate('state', 'token')
-        json = mock_request.call_args[1]['json']
-        self.assertEqual(json['state'], 'state')
-        self.assertEqual(json['token'], 'token')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_device_get(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200)
-        mock_identity_get.return_value = create_identity('1234')
-        # Test get
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.get()
-        url = mock_request.call_args[0][0]
-        self.assertEqual(url, 'https://api-test.mycroft.ai/v1/device/1234')
-
-    @patch('ovos_backend_client.identity.IdentityManager.update')
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_device_get_code(self, mock_request, mock_identity_get,
-                             mock_identit_update):
-        mock_request.return_value = create_response(200, '123ABC')
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        ret = device.get_code('state')
-        self.assertEqual(ret, '123ABC')
-        url = mock_request.call_args[0][0]
-        params = mock_request.call_args[1]
-        self.assertEqual(url, 'https://api-test.mycroft.ai/v1/device/code')
-        self.assertEqual(params["params"], {"state": "state"})
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_device_get_settings(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.get_settings()
-        url = mock_request.call_args[0][0]
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/setting')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.post')
-    def test_device_report_metric(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.report_metric('mymetric', {'data': 'mydata'})
-        url = mock_request.call_args[0][0]
-        params = mock_request.call_args[1]
-
-        content_type = params['headers']['Content-Type']
-        correct_json = {'data': 'mydata'}
-        self.assertEqual(content_type, 'application/json')
-        self.assertEqual(params['json'], correct_json)
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/metric/mymetric')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.put')
-    def test_device_send_email(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.send_email('title', 'body', 'sender')
-        url = mock_request.call_args[0][0]
-        params = mock_request.call_args[1]
-
-        content_type = params['headers']['Content-Type']
-        correct_json = {'body': 'body', 'sender': 'sender', 'title': 'title'}
-        self.assertEqual(content_type, 'application/json')
-        self.assertEqual(params['json'], correct_json)
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/message')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_device_get_oauth_token(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.get_oauth_token(1)
-        url = mock_request.call_args[0][0]
-
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/token/1')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_device_get_location(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.get_location()
-        url = mock_request.call_args[0][0]
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/location')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_device_get_subscription(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.get_subscription()
-        url = mock_request.call_args[0][0]
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/subscription')
-
-        mock_request.return_value = create_response(200, {'@type': 'free'})
-        self.assertFalse(device.is_subscriber)
-
-        mock_request.return_value = create_response(200, {'@type': 'monthly'})
-        self.assertTrue(device.is_subscriber)
-
-        mock_request.return_value = create_response(200, {'@type': 'yearly'})
-        self.assertTrue(device.is_subscriber)
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.put')
-    def test_device_upload_skills_data(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200)
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.upload_skills_data({})
-        url = mock_request.call_args[0][0]
-        data = mock_request.call_args[1]['json']
-
-        # Check that the correct url is called
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/skillJson')
-
-        # Check that the correct data is sent as json
-        self.assertTrue('blacklist' in data)
-        self.assertTrue('skills' in data)
-
-        with self.assertRaises(ValueError):
-            device.upload_skills_data('This isn\'t right at all')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_stt(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        stt = ovos_backend_client.api.STTApi('stt', backend_type=BackendType.SELENE)
-        self.assertTrue(stt.url.endswith('stt'))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.post')
-    def test_stt_stt(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        stt = ovos_backend_client.api.STTApi('https://api-test.mycroft.ai', backend_type=BackendType.SELENE)
-        stt.stt('La la la', 'en-US', 1)
-        url = mock_request.call_args[0][0]
-        self.assertEqual(url, 'https://api-test.mycroft.ai/v1/stt')
-        data = mock_request.call_args[1].get('data')
-        self.assertEqual(data, 'La la la')
-        params = mock_request.call_args[1].get('params')
-        self.assertEqual(params['lang'], 'en-US')
-
-    @patch('ovos_backend_client.identity.IdentityManager.load')
-    def test_has_been_paired(self, mock_identity_load):
-        # reset pairing cache
-        mock_identity = MagicMock()
-        mock_identity_load.return_value = mock_identity
-        # Test None
-        mock_identity.uuid = None
-        self.assertFalse(ovos_backend_client.pairing.has_been_paired())
-        # Test empty string
-        mock_identity.uuid = ""
-        self.assertFalse(ovos_backend_client.pairing.has_been_paired())
-        # Test actual id number
-        mock_identity.uuid = "1234"
-        self.assertTrue(ovos_backend_client.pairing.has_been_paired())
-
-
-class TestSettingsMeta(unittest.TestCase):
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.put')
-    def test_upload_meta(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-
-        settings_meta = {
-            'name': 'TestMeta',
-            "skill_gid": 'test_skill|19.02',
-            'skillMetadata': {
-                'sections': [
-                    {
-                        'name': 'Settings',
-                        'fields': [
-                            {
-                                'name': 'Set me',
-                                'type': 'number',
-                                'value': 4
-                            }
-                        ]
-                    }
-                ]
-            }
-        }
-        device.upload_skill_metadata(settings_meta)
-        url = mock_request.call_args[0][0]
-        params = mock_request.call_args[1]
-
-        content_type = params['headers']['Content-Type']
-        self.assertEqual(content_type, 'application/json')
-        self.assertEqual(params['json'], settings_meta)
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/settingsMeta')
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    def test_get_skill_settings(self, mock_request, mock_identity_get):
-        mock_request.return_value = create_response(200, {})
-        mock_identity_get.return_value = create_identity('1234')
-        device = ovos_backend_client.api.DeviceApi(url="https://api-test.mycroft.ai",
-                                                   backend_type=BackendType.SELENE)
-        device.get_skill_settings()
-        url = mock_request.call_args[0][0]
-        params = mock_request.call_args[1]
-
-        self.assertEqual(
-            url, 'https://api-test.mycroft.ai/v1/device/1234/skill/settings')
-
-
-class TestIsPaired(unittest.TestCase):
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_offline_true(self, mock_backend_status, mock_identity_get):
-        mock_backend_status.return_value = False
-        mock_identity = MagicMock()
-        mock_identity.uuid = '1234'
-        mock_identity_get.return_value = mock_identity
-        self.assertTrue(ovos_backend_client.pairing.is_paired(backend_type=BackendType.OFFLINE))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_offline_false(self, mock_backend_status, mock_identity_get):
-        mock_backend_status.return_value = False
-        mock_identity = MagicMock()
-        mock_identity.uuid = ''
-        mock_identity_get.return_value = mock_identity
-        self.assertFalse(ovos_backend_client.pairing.is_paired(backend_type=BackendType.OFFLINE))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.selene.SeleneBackend.device_get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_selene_true(self, mock_backend_status, mock_request, mock_identity_get):
-        mock_backend_status.return_value = False
-        mock_request.return_value = {"uuid": "1234"}
-        mock_identity = MagicMock()
-        mock_identity.is_expired.return_value = False
-        mock_identity.uuid = '1234'
-        mock_identity_get.return_value = mock_identity
-        num_calls = mock_identity_get.num_calls
-        self.assertTrue(ovos_backend_client.pairing.is_paired(backend_type=BackendType.SELENE))
-        self.assertEqual(num_calls, mock_identity_get.num_calls)
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_selene_false_local(self, mock_backend_status, mock_request, mock_identity_get):
-        mock_backend_status.return_value = False
-        mock_request.return_value = create_response(200)
-        mock_identity = MagicMock()
-        mock_identity.is_expired.return_value = False
-        mock_identity.uuid = ''
-        mock_identity_get.return_value = mock_identity
-        self.assertFalse(ovos_backend_client.pairing.is_paired(backend_type=BackendType.SELENE))
-        mock_identity.uuid = None
-        self.assertFalse(ovos_backend_client.pairing.is_paired(backend_type=BackendType.SELENE))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_selene_false_remote(self, mock_backend_status, mock_request, mock_identity_get):
-        mock_backend_status.return_value = False
-        mock_request.return_value = create_response(401)
-        mock_identity = MagicMock()
-        mock_identity.is_expired.return_value = False
-        mock_identity.uuid = '1234'
-        mock_identity_get.return_value = mock_identity
-        self.assertFalse(ovos_backend_client.pairing.is_paired(backend_type=BackendType.SELENE))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_selene_error_remote(self, mock_backend_status, mock_request, mock_identity_get):
-        mock_backend_status.return_value = False
-        mock_request.return_value = create_response(500)
-        mock_identity = MagicMock()
-        mock_identity.is_expired.return_value = False
-        mock_identity.uuid = '1234'
-        mock_identity_get.return_value = mock_identity
-        self.assertFalse(ovos_backend_client.pairing.is_paired(backend_type=BackendType.SELENE))
-
-    @patch('ovos_backend_client.identity.IdentityManager.get')
-    @patch('ovos_backend_client.backends.base.requests.get')
-    @patch('ovos_backend_client.pairing.is_backend_disabled')
-    def test_is_paired_selene_false_disabled(self, mock_backend_status, mock_request, mock_identity_get):
-        mock_backend_status.return_value = True
-        mock_request.return_value = create_response(500)
-        mock_identity = MagicMock()
-        mock_identity.is_expired.return_value = False
-        mock_identity.uuid = '1234'
-        mock_identity_get.return_value = mock_identity
-        self.assertTrue(ovos_backend_client.pairing.is_paired(backend_type=BackendType.SELENE))