diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 58e2daa04..8ca14d121 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -2130,7 +2130,7 @@ abstract class DBObject implements iDisplay
 
 			return "Bad type";
 		}
-		elseif (($oAtt instanceof AttributeClassAttCodeSet) || ($oAtt instanceof AttributeEnumSet))
+		elseif ($oAtt instanceof AttributeSet)
 		{
 			if (is_string($toCheck))
 			{
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/en.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/en.dict.itop-oauth-client.php
index 27a9e4b0e..42cb0d80f 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/en.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/en.dict.itop-oauth-client.php
@@ -9,7 +9,7 @@
 Dict::Add('EN US', 'English', 'English', [
 	'Menu:CreateMailbox' => 'Create a mailbox...',
 	'Menu:OAuthClient' => 'OAuth client',
-	'Menu:OAuthClient+' => '',
+	'Menu:OAuthClient+' => 'Oauth for email access',
 	'Menu:GenerateTokens' => 'Generate access token...',
 	'Menu:RegenerateTokens' => 'Regenerate access token...',
 
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/fr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/fr.dict.itop-oauth-client.php
index 18e790abd..a11f7967b 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/fr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/fr.dict.itop-oauth-client.php
@@ -87,7 +87,7 @@ Pour recalculer la valeur par défaut, il faut effacer le champ',
 	'Menu:CreateMailbox' => 'Créer une boite mail...',
 	'Menu:GenerateTokens' => 'Créer un jeton d\'accès...',
 	'Menu:OAuthClient' => 'Client OAuth',
-	'Menu:OAuthClient+' => '',
+	'Menu:OAuthClient+' => 'Client OAuth pour l\'email',
 	'Menu:RegenerateTokens' => 'Recréer un jeton d\'accès..',
 	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'La combinaison Login (%1$s) and Utilisé pour SMTP (%2$s) a déjà été utilisée pour OAuth Client',
 	'OAuthClient:baseinfo' => 'Information',
diff --git a/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php b/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
index c50335f07..f7bfd7369 100644
--- a/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
+++ b/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
@@ -137,7 +137,6 @@ abstract class ItopCustomDatamodelTestCase extends ItopDataTestCase
 			$sConfFile = utils::GetConfigFilePath($sTestEnv);
 			$sConfFolder = dirname($sConfFile);
 			if (is_file($sConfFile)) {
-				chmod($sConfFile, 0777);
 				SetupUtils::tidydir($sConfFolder);
 			}
 
diff --git a/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php b/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
index f630e1827..7cbe20215 100644
--- a/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
+++ b/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
@@ -129,6 +129,10 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
 				if ($sClass === '') {
 					continue;
 				}
+				if (class_exists($sClass)) {
+					echo "class $sClass already loaded somehow \n";
+					continue;
+				}
                 require_once $sFile;
 				$oReflectionClass = new ReflectionClass($sClass);
 				if ($oReflectionClass->isAbstract()) {