diff --git a/tests/test_client.py b/tests/test_client.py
index d543d1be918129a63a9d31fb6c4a3abe145e3b06..ec4333b357f1a54907ea7dc27657f03226d1c052 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -94,6 +94,48 @@ class ClientTests(unittest.TestCase):
                                               'https': 'http://proxy:3128',
                                               'no': ''})
 
+    """
+    def test_init_operation_map_override(self):
+        operation_map_custom = {
+            'SessionCreate': {'RequestMethod': 'POST',
+                              'Route': '/Session',
+                              'Result': 'SessionID'},
+            'TicketCreate': {'RequestMethod': 'POST',
+                             'Route': '/Ticket',
+                             'Result': 'TicketID'},
+            'TicketGet': {'RequestMethod': 'GET',
+                          'Route': '/Ticket/:TicketID',
+                          'Result': 'Ticket'},
+            'TicketGetList': {'RequestMethod': 'GET',
+                              'Route': '/TicketList',
+                              'Result': 'Ticket'},
+            'TicketSearch': {'RequestMethod': 'GET',
+                             'Route': '/Ticket',
+                             'Result': 'TicketID'},
+            'TicketUpdate': {'RequestMethod': 'PATCH',
+                             'Route': '/Ticket/:TicketID',
+                             'Result': 'TicketID'}
+        }
+        client = Client(baseurl="http://fqdn/")
+        self.assertIsInstance(client, Client)
+    """
+
+    """
+    def test_init_type_map_override(self):
+        type_map_custom = {
+            'SessionCreate': 'SessionID',
+            'TicketCreate': 'TicketID',
+            'TicketGet': 'Ticket',
+            'TicketGetList': 'Ticket',
+            'TicketSearch': 'TicketID',
+            'TicketUpdate': 'TicketID'
+        }
+        client = Client(baseurl="http://fqdn/",
+                        webservicename="foo",
+                        type_map=type_map_custom)
+        self.assertIsInstance(client, Client)
+    """
+
     def test_session_check_is_valid_no_session_id_error(self):
         """Test"""
         client = Client(baseurl="http://fqdn/")
@@ -116,7 +158,7 @@ class ClientTests(unittest.TestCase):
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
-    def test_session_check_is_valid_invalid_sid(self, mock_parse_validate, mock_send_req):
+    def test_session_check_is_valid_invalid_session_id(self, mock_parse_validate, mock_send_req):
         """Test session_check_is_valid with a given invalid session id"""
         obj = Client(baseurl="http://fqdn/")
         obj.session_id_store.value = "some_other_value"
@@ -175,7 +217,7 @@ class ClientTests(unittest.TestCase):
                                                          mock_read_s_id,
                                                          mock_is_valid,
                                                          mock_wr):
-        # Tests session_restore_or_set_up_new when read from file successful but session nok"
+        """Tests session_restore_or_set_up_new when read from file successful but session nok"""
         obj = Client(baseurl="http://fqdn")
         obj.session_id_store.value = "foobar"
 
@@ -1363,25 +1405,6 @@ class ClientTests(unittest.TestCase):
                                "TicketID is None but Route requires TicketID.*",
                                obj._build_url)
 
-    def test__build_url_faq_public_category_list(self):
-        """Test _build_url for faq_public_category_list with invalid Route"""
-        obj = Client(baseurl="http://fqdn")
-        obj.operation = "PublicCategoryList"
-
-        self.assertEqual("http://fqdn/otrs/nph-genericinterface.pl/Webservice/"
-                         "GenericFAQConnectorREST/PublicCategoryList",
-                         obj._build_url())
-
-    def test__build_url_faq_public_category_list_invalid(self):
-        """Test _build_url for faq_public_category_list with invalid Route"""
-        obj = Client(baseurl="http://fqdn")
-        obj.operation = "PublicCategoryList"
-
-        obj.ws_config["PublicCategoryList"]["Route"] = "foobar"
-        self.assertRaisesRegex(NotImplementedError,
-                               "could not _build_url for.*",
-                               obj._build_url)
-
     def test__build_url_faq_language_list(self):
         """Test _build_url for faq_language_list"""
         obj = Client(baseurl="http://fqdn")