diff --git a/tests/php-unit-tests/unitary-tests/core/Delta/delta_test_sanitize_output.xml b/tests/php-unit-tests/unitary-tests/core/Delta/delta_test_sanitize_output.xml
index 798f5f8a0..4c475c9e7 100644
--- a/tests/php-unit-tests/unitary-tests/core/Delta/delta_test_sanitize_output.xml
+++ b/tests/php-unit-tests/unitary-tests/core/Delta/delta_test_sanitize_output.xml
@@ -1,116 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
-    <classes>
-        <class id="TestServer" _delta="define">
-            <parent>cmdbAbstractObject</parent>
-            <properties>
-                <category>bizmodel</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>test_server</db_table>
-                <db_key_field>id</db_key_field>
-            </properties>
-            <presentation/>
-            <methods/>
-            <fields>
-                <field id="contact_list" xsi:type="AttributeLinkedSetIndirect">
-                    <linked_class>lnkContactTestToServer</linked_class>
-                    <ext_key_to_me>test_server_id</ext_key_to_me>
-                    <ext_key_to_remote>contact_test_id</ext_key_to_remote>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="password_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>PasswordTest</linked_class>
-                    <ext_key_to_me>server_test_id</ext_key_to_me>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="name" xsi:type="AttributeString">
-                    <sql>name</sql>
-                    <default_value/>
-                    <is_null_allowed>false</is_null_allowed>
-                </field>
-            </fields>
-        </class>
+  <classes>
+    <class id="TestServer" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>test_server</db_table>
+        <db_key_field>id</db_key_field>
+      </properties>
+      <presentation/>
+      <methods/>
+      <fields>
+        <field id="contact_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkContactTestToServer</linked_class>
+          <ext_key_to_me>test_server_id</ext_key_to_me>
+          <ext_key_to_remote>contact_test_id</ext_key_to_remote>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="password_list" xsi:type="AttributeLinkedSet">
+          <linked_class>PasswordTest</linked_class>
+          <ext_key_to_me>server_test_id</ext_key_to_me>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+    </class>
 
 
-        <class id="ContactTest" _delta="define">
-            <parent>cmdbAbstractObject</parent>
-            <properties>
-                <category>bizmodel</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>contact_test</db_table>
-                <db_key_field>id</db_key_field>
-            </properties>
-            <presentation/>
-            <methods/>
-            <fields>
-                <field id="password" xsi:type="AttributeEncryptedString">
-                    <sql>password</sql>
-                </field>
-                <field id="server_test_list" xsi:type="AttributeLinkedSetIndirect">
-                    <linked_class>lnkContactTestToServer</linked_class>
-                    <ext_key_to_me>contact_test_id</ext_key_to_me>
-                    <ext_key_to_remote>test_server_id</ext_key_to_remote>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-            </fields>
-        </class>
+    <class id="ContactTest" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>contact_test</db_table>
+        <db_key_field>id</db_key_field>
+      </properties>
+      <presentation/>
+      <methods/>
+      <fields>
+        <field id="password" xsi:type="AttributeEncryptedString">
+          <sql>password</sql>
+        </field>
+        <field id="server_test_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkContactTestToServer</linked_class>
+          <ext_key_to_me>contact_test_id</ext_key_to_me>
+          <ext_key_to_remote>test_server_id</ext_key_to_remote>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+    </class>
 
 
-        <class id="lnkContactTestToServer" _delta="define">
-            <parent>cmdbAbstractObject</parent>
-            <properties>
-                <category>bizmodel</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>lnk_contact_server_test</db_table>
-                <db_key_field>id</db_key_field>
-            </properties>
-            <presentation/>
-            <methods/>
-            <fields>
-                <field id="contact_test_password" xsi:type="AttributeExternalField" _delta="define">
-                    <extkey_attcode>contact_test_id</extkey_attcode>
-                    <target_attcode>password</target_attcode>
-                </field>
-                <field id="test_server_id" xsi:type="AttributeExternalKey" _delta="define">
-                    <target_class>TestServer</target_class>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <sql>test_server</sql>
-                    <is_null_allowed>false</is_null_allowed>
+    <class id="lnkContactTestToServer" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnk_contact_server_test</db_table>
+        <db_key_field>id</db_key_field>
+      </properties>
+      <presentation/>
+      <methods/>
+      <fields>
+        <field id="contact_test_password" xsi:type="AttributeExternalField" _delta="define">
+          <extkey_attcode>contact_test_id</extkey_attcode>
+          <target_attcode>password</target_attcode>
+        </field>
+        <field id="test_server_id" xsi:type="AttributeExternalKey" _delta="define">
+          <target_class>TestServer</target_class>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <sql>test_server</sql>
+          <is_null_allowed>false</is_null_allowed>
 
-                </field>
-                <field id="contact_test_id" xsi:type="AttributeExternalKey" _delta="define">
-                    <target_class>ContactTest</target_class>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <sql>contact_test</sql>
-                    <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="contact_test_id" xsi:type="AttributeExternalKey" _delta="define">
+          <target_class>ContactTest</target_class>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <sql>contact_test</sql>
+          <is_null_allowed>false</is_null_allowed>
 
-                </field>
-            </fields>
-        </class>
-        <class id="PasswordTest" _delta="define">
-            <parent>cmdbAbstractObject</parent>
-            <properties>
-                <category>bizmodel</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>password_test</db_table>
-                <db_key_field>id</db_key_field>
-            </properties>
-            <presentation/>
-            <methods/>
-            <fields>
-                <field id="server_test_id" xsi:type="AttributeExternalKey" _delta="define">
-                    <target_class>TestServer</target_class>
-                    <sql>server_test_id</sql>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                </field>
-                <field id="password" xsi:type="AttributeEncryptedString" _delta="define">
-                    <sql>password</sql>
-                </field>
-            </fields>
-        </class>
-    </classes>
+        </field>
+      </fields>
+    </class>
+    <class id="PasswordTest" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>password_test</db_table>
+        <db_key_field>id</db_key_field>
+      </properties>
+      <presentation/>
+      <methods/>
+      <fields>
+        <field id="server_test_id" xsi:type="AttributeExternalKey" _delta="define">
+          <target_class>TestServer</target_class>
+          <sql>server_test_id</sql>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="password" xsi:type="AttributeEncryptedString" _delta="define">
+          <sql>password</sql>
+        </field>
+      </fields>
+    </class>
+  </classes>
 </itop_design>
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/core/RestServicesSanitizeOutputTest.php b/tests/php-unit-tests/unitary-tests/core/RestServicesSanitizeOutputTest.php
index 806ad234f..199eeb4bf 100644
--- a/tests/php-unit-tests/unitary-tests/core/RestServicesSanitizeOutputTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/RestServicesSanitizeOutputTest.php
@@ -21,144 +21,149 @@ use RestResultWithObjects;
  */
 class RestServicesSanitizeOutputTest extends ItopCustomDatamodelTestCase
 {
-    private const SIMPLE_PASSWORD = '123456';
+	private const SIMPLE_PASSWORD = '123456';
 
-    /**
-     * @throws Exception
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-        // Workaround to cope with inconsistent settings in itop-config files from the CI
-        AttributeEncryptedString::$sKey = '6eb9d9afa3ee0fbcebe622a33bf57aaeafb7c37998fd24c403c2522c2d60117f';
-    }
+	/**
+	 * @throws Exception
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
+		// Workaround to cope with inconsistent settings in itop-config files from the CI
+		AttributeEncryptedString::$sKey = '6eb9d9afa3ee0fbcebe622a33bf57aaeafb7c37998fd24c403c2522c2d60117f';
+	}
 
-    /**
-     * @return void
-     * @throws CoreException
-     */
-    public function testSanitizeAttributeOnRequestedObject()
-    {
-        $oContactTest = MetaModel::NewObject('ContactTest', [
-                        'password' => self::SIMPLE_PASSWORD]
-        );
-        $oRestResultWithObject = new RestResultWithObjects();
-        $oRestResultWithObject->AddObject(0, 'ok', $oContactTest, ['ContactTest' => ['password']]);
-        $oRestResultWithObject->SanitizeContent();
-        static::assertEquals(
-                '{"objects":{"ContactTest::-1":{"code":0,"message":"ok","class":"ContactTest","key":-1,"fields":{"password":"*****"}}},"code":0,"message":null}',
-                json_encode($oRestResultWithObject));
-    }
+	/**
+	 * @return void
+	 * @throws CoreException
+	 */
+	public function testSanitizeAttributeOnRequestedObject()
+	{
+		$oContactTest = MetaModel::NewObject('ContactTest', [
+				'password' => self::SIMPLE_PASSWORD
+			]
+		);
+		$oRestResultWithObject = new RestResultWithObjects();
+		$oRestResultWithObject->AddObject(0, 'ok', $oContactTest, ['ContactTest' => ['password']]);
+		$oRestResultWithObject->SanitizeContent();
+		static::assertEquals(
+			'{"objects":{"ContactTest::-1":{"code":0,"message":"ok","class":"ContactTest","key":-1,"fields":{"password":"*****"}}},"code":0,"message":null}',
+			json_encode($oRestResultWithObject));
+	}
 
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function testSanitizeAttributeExternalFieldOnLink()
-    {
-        $oContactTest = $this->createObject('ContactTest', [
-                        'password' => self::SIMPLE_PASSWORD]
-        );
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function testSanitizeAttributeExternalFieldOnLink()
+	{
+		$oContactTest = $this->createObject('ContactTest', [
+				'password' => self::SIMPLE_PASSWORD
+			]
+		);
 
-        $oTestServer = $this->createObject('TestServer', [
-                'name' => 'test_server',
-        ]);
+		$oTestServer = $this->createObject('TestServer', [
+			'name' => 'test_server',
+		]);
 
 
-        // create lnkContactTestToServer
-        $oLnkContactTestToServer = $this->createObject('lnkContactTestToServer', [
-                'contact_test_id' => $oContactTest->GetKey(),
-                'test_server_id' => $oTestServer->GetKey()
-        ]);
+		// create lnkContactTestToServer
+		$oLnkContactTestToServer = $this->createObject('lnkContactTestToServer', [
+			'contact_test_id' => $oContactTest->GetKey(),
+			'test_server_id'  => $oTestServer->GetKey()
+		]);
 
-        $oRestResultWithObject = new RestResultWithObjects();
-        $oRestResultWithObject->AddObject(0, 'ok', $oLnkContactTestToServer,
-                ['lnkContactTestToServer' => ['contact_test_password']]);
+		$oRestResultWithObject = new RestResultWithObjects();
+		$oRestResultWithObject->AddObject(0, 'ok', $oLnkContactTestToServer,
+			['lnkContactTestToServer' => ['contact_test_password']]);
 
-        $oRestResultWithObject->SanitizeContent();
+		$oRestResultWithObject->SanitizeContent();
 
-        static::assertContains(
-                '*****',
-                json_encode($oRestResultWithObject));
+		static::assertStringContainsString(
+			'*****',
+			json_encode($oRestResultWithObject));
 
-        static::assertNotContains(
-                self::SIMPLE_PASSWORD,
-                json_encode($oRestResultWithObject));
-    }
+		static::assertStringNotContainsString(
+			self::SIMPLE_PASSWORD,
+			json_encode($oRestResultWithObject));
+	}
 
-    /**
-     * @throws Exception
-     */
-    public function testSanitizeAttributeOnObjectRelatedThroughNNRelation()
-    {
-        $oContactTest = $this->createObject('ContactTest', [
-                'password' => self::SIMPLE_PASSWORD]);
+	/**
+	 * @throws Exception
+	 */
+	public function testSanitizeAttributeOnObjectRelatedThroughNNRelation()
+	{
+		$oContactTest = $this->createObject('ContactTest', [
+			'password' => self::SIMPLE_PASSWORD
+		]);
 
-        $oTestServer = $this->createObject('TestServer', [
-                'name' => 'test_server',
-        ]);
+		$oTestServer = $this->createObject('TestServer', [
+			'name' => 'test_server',
+		]);
 
-        // create lnkContactTestToServer
-        $this->createObject('lnkContactTestToServer', [
-                'contact_test_id' => $oContactTest->GetKey(),
-                'test_server_id' => $oTestServer->GetKey()
-        ]);
+		// create lnkContactTestToServer
+		$this->createObject('lnkContactTestToServer', [
+			'contact_test_id' => $oContactTest->GetKey(),
+			'test_server_id'  => $oTestServer->GetKey()
+		]);
 
-        $oRestResultWithObject = new RestResultWithObjects();
-        $oRestResultWithObject->AddObject(0, 'ok', $oTestServer,
-                ['TestServer' => ['contact_list']]);
+		$oTestServer->Reload();
 
-        $oRestResultWithObject->SanitizeContent();
-        static::assertContains(
-                '*****',
-                json_encode($oRestResultWithObject));
+		$oRestResultWithObject = new RestResultWithObjects();
+		$oRestResultWithObject->AddObject(0, 'ok', $oTestServer,
+			['TestServer' => ['contact_list']]);
 
-        static::assertNotContains(
-                self::SIMPLE_PASSWORD,
-                json_encode($oRestResultWithObject));
-    }
+		$oRestResultWithObject->SanitizeContent();
+		static::assertStringContainsString(
+			'*****',
+			json_encode($oRestResultWithObject));
+
+		static::assertStringNotContainsString(
+			self::SIMPLE_PASSWORD,
+			json_encode($oRestResultWithObject));
+	}
 
 
-    /**
-     * @throws CoreException
-     * @throws CoreUnexpectedValue
-     * @throws ArchivedObjectException
-     * @throws Exception
-     */
-    public function testSanitizeOnObjectRelatedThrough1NRelation()
-    {
-        $oTestServer = $this->createObject('TestServer', [
-                'name' => 'my_server',
-        ]);
+	/**
+	 * @throws CoreException
+	 * @throws CoreUnexpectedValue
+	 * @throws ArchivedObjectException
+	 * @throws Exception
+	 */
+	public function testSanitizeOnObjectRelatedThrough1NRelation()
+	{
+		$oTestServer = $this->createObject('TestServer', [
+			'name' => 'my_server',
+		]);
 
-        $oPassword = new PasswordTest();
-        $oPassword->Set('password', self::SIMPLE_PASSWORD);
-        $oPassword->Set('server_test_id', $oTestServer->GetKey());
+		$oPassword = new PasswordTest();
+		$oPassword->Set('password', self::SIMPLE_PASSWORD);
+		$oPassword->Set('server_test_id', $oTestServer->GetKey());
 
-        /** @var ormLinkSet $oContactList */
-        $oContactList = $oTestServer->Get('password_list');
-        $oContactList->AddItem($oPassword);
-        $oTestServer->Set('password_list', $oContactList);
+		/** @var ormLinkSet $oContactList */
+		$oContactList = $oTestServer->Get('password_list');
+		$oContactList->AddItem($oPassword);
+		$oTestServer->Set('password_list', $oContactList);
 
-        $oRestResultWithObject = new RestResultWithObjects();
-        $oRestResultWithObject->AddObject(0, 'ok', $oTestServer, ['TestServer' => ['id', 'password_list']]);
-        $oRestResultWithObject->SanitizeContent();
+		$oRestResultWithObject = new RestResultWithObjects();
+		$oRestResultWithObject->AddObject(0, 'ok', $oTestServer, ['TestServer' => ['id', 'password_list']]);
+		$oRestResultWithObject->SanitizeContent();
 
-        static::assertContains(
-                '*****',
-                json_encode($oRestResultWithObject));
+		static::assertStringContainsString(
+			'*****',
+			json_encode($oRestResultWithObject));
 
-        static::assertNotContains(
-                self::SIMPLE_PASSWORD,
-                json_encode($oRestResultWithObject));
+		static::assertStringNotContainsString(
+			self::SIMPLE_PASSWORD,
+			json_encode($oRestResultWithObject));
 
-    }
+	}
 
-    /**
-     * @return string Abs path to the XML delta to use for the tests of that class
-     */
-    public function GetDatamodelDeltaAbsPath(): string
-    {
-        return __DIR__ . '/Delta/delta_test_sanitize_output.xml';
-    }
+	/**
+	 * @return string Abs path to the XML delta to use for the tests of that class
+	 */
+	public function GetDatamodelDeltaAbsPath(): string
+	{
+		return __DIR__.'/Delta/delta_test_sanitize_output.xml';
+	}
 }