diff --git a/tests/Entity/UserSystem/UserTest.php b/tests/Entity/UserSystem/UserTest.php
index 822e09b0..11837b77 100644
--- a/tests/Entity/UserSystem/UserTest.php
+++ b/tests/Entity/UserSystem/UserTest.php
@@ -26,7 +26,7 @@ use App\Entity\UserSystem\User;
 use App\Entity\UserSystem\WebauthnKey;
 use Doctrine\Common\Collections\Collection;
 use PHPUnit\Framework\TestCase;
-use Ramsey\Uuid\Uuid;
+use Symfony\Component\Uid\Uuid;
 use Webauthn\TrustPath\EmptyTrustPath;
 
 class UserTest extends TestCase
@@ -133,7 +133,7 @@ class UserTest extends TestCase
             [],
             "Test",
             new EmptyTrustPath(),
-            Uuid::fromDateTime(new \DateTime()),
+            Uuid::v4(),
             "",
             "",
             0
diff --git a/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php b/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php
index 5cdca507..8712b310 100644
--- a/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php
+++ b/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php
@@ -27,7 +27,7 @@ use App\Entity\UserSystem\User;
 use App\Entity\UserSystem\WebauthnKey;
 use App\EventSubscriber\UserSystem\PasswordChangeNeededSubscriber;
 use PHPUnit\Framework\TestCase;
-use Ramsey\Uuid\Uuid;
+use Symfony\Component\Uid\Uuid;
 use Webauthn\TrustPath\EmptyTrustPath;
 
 class PasswordChangeNeededSubscriberTest extends TestCase
@@ -61,7 +61,7 @@ class PasswordChangeNeededSubscriberTest extends TestCase
             [],
             "Test",
             new EmptyTrustPath(),
-            Uuid::fromDateTime(new \DateTime()),
+           Uuid::v4(),
             "",
             "",
             0
diff --git a/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php b/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php
index ae4065b6..434527d8 100644
--- a/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php
+++ b/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php
@@ -22,7 +22,7 @@ namespace App\Tests\Security;
 
 use App\Entity\UserSystem\User;
 use App\Security\EnsureSAMLUserForSAMLLoginChecker;
-use Hslavich\OneloginSamlBundle\Security\Http\Authenticator\Token\SamlToken;
+use Nbgrp\OneloginSamlBundle\Security\Http\Authenticator\Token\SamlToken;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
diff --git a/tests/Services/ElementTypeNameGeneratorTest.php b/tests/Services/ElementTypeNameGeneratorTest.php
index 2fbca494..a8a385b6 100644
--- a/tests/Services/ElementTypeNameGeneratorTest.php
+++ b/tests/Services/ElementTypeNameGeneratorTest.php
@@ -44,8 +44,7 @@ class ElementTypeNameGeneratorTest extends WebTestCase
         parent::setUp();
 
         //Get an service instance.
-        self::bootKernel();
-        $this->service = self::$container->get(ElementTypeNameGenerator::class);
+        $this->service = self::getContainer()->get(ElementTypeNameGenerator::class);
     }
 
     public function testGetLocalizedTypeNameCombination(): void