diff --git a/tests/unit/plugins/modules/fake_api.py b/tests/unit/plugins/modules/fake_api.py
index 03cb6d22..a2cf23c3 100644
--- a/tests/unit/plugins/modules/fake_api.py
+++ b/tests/unit/plugins/modules/fake_api.py
@@ -88,7 +88,7 @@ def select(self, *args):
         if result:
             return result
         else:
-            return ["no results for 'interface bridge 'query' %s" % ' '.join(args)]
+            return []
 
     def select_where(self, api, path):
         api_path = Where()
@@ -103,7 +103,7 @@ def select(self, *args):
         return self
 
     def where(self, *args):
-        return ["*A1"]
+        return [{".id": "*A1", "name": "dummy_bridge_A1"}]
 
 
 class Key(object):
diff --git a/tests/unit/plugins/modules/test_api.py b/tests/unit/plugins/modules/test_api.py
index 596859dd..37a7ec81 100644
--- a/tests/unit/plugins/modules/test_api.py
+++ b/tests/unit/plugins/modules/test_api.py
@@ -164,6 +164,11 @@ def test_api_query(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+            {'.id': '*A2', 'name': 'dummy_bridge_A2'},
+            {'.id': '*A3', 'name': 'dummy_bridge_A3'},
+        ])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api)
     def test_api_query_missing_key(self):
@@ -175,6 +180,7 @@ def test_api_query_missing_key(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], ["no results for 'interface bridge 'query' .id other"])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api.select_where)
     def test_api_query_and_WHERE(self):
@@ -186,6 +192,9 @@ def test_api_query_and_WHERE(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+        ])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api.select_where)
     def test_api_query_and_WHERE_no_cond(self):
@@ -197,6 +206,9 @@ def test_api_query_and_WHERE_no_cond(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+        ])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api)
     def test_api_extended_query(self):
@@ -210,6 +222,11 @@ def test_api_extended_query(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+            {'.id': '*A2', 'name': 'dummy_bridge_A2'},
+            {'.id': '*A3', 'name': 'dummy_bridge_A3'},
+        ])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api)
     def test_api_extended_query_missing_key(self):
@@ -223,6 +240,7 @@ def test_api_extended_query_missing_key(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api.select_where)
     def test_api_extended_query_and_WHERE(self):
@@ -243,6 +261,9 @@ def test_api_extended_query_and_WHERE(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+        ])
 
     @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api.select_where)
     def test_api_extended_query_and_WHERE_no_cond(self):
@@ -263,3 +284,38 @@ def test_api_extended_query_and_WHERE_no_cond(self):
 
         result = exc.exception.args[0]
         self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+        ])
+
+    @patch('ansible_collections.community.routeros.plugins.modules.api.ROS_api_module.api_add_path', new=fake_ros_api.select_where)
+    def test_api_extended_query_and_WHERE_or(self):
+        with self.assertRaises(AnsibleExitJson) as exc:
+            module_args = self.config_module_args.copy()
+            module_args['extended_query'] = {
+                'attributes': ['.id', 'name'],
+                'where': [
+                    {
+                        'or': [
+                            {
+                                'attribute': 'name',
+                                'is': 'in',
+                                'value': [1, 2],
+                            },
+                            {
+                                'attribute': 'name',
+                                'is': '!=',
+                                'value': 5,
+                            },
+                        ],
+                    },
+                ],
+            }
+            set_module_args(module_args)
+            self.module.main()
+
+        result = exc.exception.args[0]
+        self.assertEqual(result['changed'], False)
+        self.assertEqual(result['msg'], [
+            {'.id': '*A1', 'name': 'dummy_bridge_A1'},
+        ])