diff --git a/tests/test_client.py b/tests/test_client.py
index f9198e150aa645c199672cd385cd2e2a374f1362..d2e612a987ec8e3c6af9526f83a2915a2e9698df 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -358,8 +358,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.ticket_create)
+                               'Call session_create.*',
+                               obj.ticket_create)
 
     def test_ticket_create_no_ticket(self):
         """Test ticket_create - no ticket specified"""
@@ -367,8 +367,8 @@ class ClientTests(unittest.TestCase):
                      webservicename="GenericTicketConnectorREST")
         obj.session_id_store.value = "some_session_id"
         self.assertRaisesRegex(ArgumentMissingError,
-                                'Ticket',
-                                obj.ticket_create)
+                               'Ticket',
+                               obj.ticket_create)
 
     def test_ticket_create_no_article(self):
         """Test ticket_create - no article specified"""
@@ -378,8 +378,8 @@ class ClientTests(unittest.TestCase):
         tic = Ticket(dct={'Title': 'foo'})
 
         self.assertRaisesRegex(ArgumentMissingError,
-                                'Article',
-                                obj.ticket_create, ticket=tic)
+                               'Article',
+                               obj.ticket_create, ticket=tic)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -516,8 +516,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.ticket_get_by_list, [1])
+                               'Call session_create.*',
+                               obj.ticket_get_by_list, [1])
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -541,9 +541,9 @@ class ClientTests(unittest.TestCase):
         obj.session_id_store.value = "some_session_id"
 
         self.assertRaisesRegex(ArgumentInvalidError,
-                                "Please provide list of IDs!",
-                                obj.ticket_get_by_list,
-                                1)
+                               "Please provide list of IDs!",
+                               obj.ticket_get_by_list,
+                               1)
 
     def test_ticket_get_by_list_fail_string_provided(self):
         """Tests ticket_get_by_list fail int was provided"""
@@ -551,9 +551,9 @@ class ClientTests(unittest.TestCase):
         obj.session_id_store.value = "some_session_id"
 
         self.assertRaisesRegex(ArgumentInvalidError,
-                                "Please provide list of IDs!",
-                                obj.ticket_get_by_list,
-                                "4711")
+                               "Please provide list of IDs!",
+                               obj.ticket_get_by_list,
+                               "4711")
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -596,8 +596,8 @@ class ClientTests(unittest.TestCase):
         obj.session_id_store.value = "some_session_id"
 
         self.assertRaisesRegex(ArgumentInvalidError,
-                                'Provide ticket_number as str/unicode. Got ticket_number as int.',
-                                obj.ticket_get_by_number, ticket_number=1)
+                               'Provide ticket_number as str/unicode. Got ticket_number as int.',
+                               obj.ticket_get_by_number, ticket_number=1)
 
     @mock.patch('pyotrs.Client.ticket_search', autospec=True)
     def test_ticket_get_by_number_with_string_no_result(self, mock_ticket_search):
@@ -651,9 +651,9 @@ class ClientTests(unittest.TestCase):
 
         mock_ticket_search.return_value = [1, 2, 3]
         self.assertRaisesRegex(ValueError,
-                                'Found more than one result for Ticket Number: SomeONumber',
-                                obj.ticket_get_by_number,
-                                'SomeONumber')
+                               'Found more than one result for Ticket Number: SomeONumber',
+                               obj.ticket_get_by_number,
+                               'SomeONumber')
 
         self.assertEqual(mock_ticket_search.call_count, 1)
 
@@ -662,8 +662,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.ticket_search)
+                               'Call session_create.*',
+                               obj.ticket_search)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -732,7 +732,7 @@ class ClientTests(unittest.TestCase):
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
-    def test_ticket_search_dynamic_field(self, mock_parse_validate, mock_send_req):
+    def test_ticket_search_dynamic_field_two(self, mock_parse_validate, mock_send_req):
         """Tests ticket_search datetime"""
         obj = Client(baseurl="http://fqdn", webservicename="GenericTicketConnectorREST")
         obj.session_id_store.value = "some_session_id"
@@ -776,8 +776,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.ticket_update, 1)
+                               'Call session_create.*',
+                               obj.ticket_update, 1)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -844,9 +844,9 @@ class ClientTests(unittest.TestCase):
         att2 = Attachment.create_basic("YmFyCg==", "text/plain", "dümmy.txt")
 
         self.assertRaisesRegex(ArgumentMissingError,
-                                'To create an attachment an article is needed!',
-                                obj.ticket_update,
-                                1, attachment_list=[att1, att2])
+                               'To create an attachment an article is needed!',
+                               obj.ticket_update,
+                               1, attachment_list=[att1, att2])
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -957,8 +957,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_add, 1, 2)
+                               'Call session_create.*',
+                               obj.link_add, 1, 2)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -980,8 +980,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_delete, 1, 2)
+                               'Call session_create.*',
+                               obj.link_delete, 1, 2)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -1003,8 +1003,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_delete_all, 1)
+                               'Call session_create.*',
+                               obj.link_delete_all, 1)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -1026,8 +1026,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_list, 1)
+                               'Call session_create.*',
+                               obj.link_list, 1)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -1079,8 +1079,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_possible_link_list)
+                               'Call session_create.*',
+                               obj.link_possible_link_list)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
@@ -1117,8 +1117,9 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_possible_objects_list)
+                               'Call session_create.*',
+                               obj.link_possible_objects_list)
+        
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)
     def test_link_possible_objects_list(self, mock_parse_validate, mock_send_req):
@@ -1154,8 +1155,8 @@ class ClientTests(unittest.TestCase):
         obj = Client(baseurl="http://fqdn",
                      webservicename="GenericTicketConnectorREST")
         self.assertRaisesRegex(SessionNotCreated,
-                                'Call session_create.*',
-                                obj.link_possible_types_list)
+                               'Call session_create.*',
+                               obj.link_possible_types_list)
 
     @mock.patch('pyotrs.Client._send_request')
     @mock.patch('pyotrs.Client._parse_and_validate_response', autospec=True)