diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php
index 465cb5b07..97f84f07d 100644
--- a/src/Core/CustomMethods.php
+++ b/src/Core/CustomMethods.php
@@ -171,11 +171,11 @@ trait CustomMethods
         }
         // Lazy define methods
         $lowerClass = strtolower(static::class);
-        if (!isset(self::$extra_methods[$lowerClass])) {
+        if (!isset(self::class::$extra_methods[$lowerClass])) {
             $this->defineMethods();
         }
 
-        return self::$extra_methods[$lowerClass][strtolower($method)] ?? null;
+        return self::class::$extra_methods[$lowerClass][strtolower($method)] ?? null;
     }
 
     /**
@@ -190,8 +190,8 @@ trait CustomMethods
 
         // Query extra methods
         $lowerClass = strtolower(static::class);
-        if ($custom && isset(self::$extra_methods[$lowerClass])) {
-            $methods = array_merge(self::$extra_methods[$lowerClass], $methods);
+        if ($custom && isset(self::class::$extra_methods[$lowerClass])) {
+            $methods = array_merge(self::class::$extra_methods[$lowerClass], $methods);
         }
 
         return $methods;
@@ -207,19 +207,19 @@ trait CustomMethods
     {
         $class = is_object($class) ? get_class($class) : ($class ?: static::class);
         $lowerClass = strtolower($class);
-        if (isset(self::$built_in_methods[$lowerClass])) {
-            return self::$built_in_methods[$lowerClass];
+        if (isset(self::class::$built_in_methods[$lowerClass])) {
+            return self::class::$built_in_methods[$lowerClass];
         }
 
         // Build new list
         $reflection = new ReflectionClass($class);
         $methods = $reflection->getMethods(ReflectionMethod::IS_PUBLIC);
-        self::$built_in_methods[$lowerClass] = [];
+        self::class::$built_in_methods[$lowerClass] = [];
         foreach ($methods as $method) {
             $name = $method->getName();
-            self::$built_in_methods[$lowerClass][strtolower($name)] = $name;
+            self::class::$built_in_methods[$lowerClass][strtolower($name)] = $name;
         }
-        return self::$built_in_methods[$lowerClass];
+        return self::class::$built_in_methods[$lowerClass];
     }
 
     /**
@@ -280,10 +280,10 @@ trait CustomMethods
 
         // Merge with extra_methods
         $lowerClass = strtolower($class);
-        if (isset(self::$extra_methods[$lowerClass])) {
-            self::$extra_methods[$lowerClass] = array_merge(self::$extra_methods[$lowerClass], $newMethods);
+        if (isset(self::class::$extra_methods[$lowerClass])) {
+            self::class::$extra_methods[$lowerClass] = array_merge(self::class::$extra_methods[$lowerClass], $newMethods);
         } else {
-            self::$extra_methods[$lowerClass] = $newMethods;
+            self::class::$extra_methods[$lowerClass] = $newMethods;
         }
     }
 
@@ -305,17 +305,17 @@ trait CustomMethods
         }
 
         $lowerClass = strtolower($class);
-        if (!isset(self::$extra_methods[$lowerClass])) {
+        if (!isset(self::class::$extra_methods[$lowerClass])) {
             return;
         }
         $methods = $this->findMethodsFrom($extension);
 
         // Unset by key
-        self::$extra_methods[$lowerClass] = array_diff_key(self::$extra_methods[$lowerClass], $methods);
+        self::class::$extra_methods[$lowerClass] = array_diff_key(self::class::$extra_methods[$lowerClass], $methods);
 
         // Clear empty list
-        if (empty(self::$extra_methods[$lowerClass])) {
-            unset(self::$extra_methods[$lowerClass]);
+        if (empty(self::class::$extra_methods[$lowerClass])) {
+            unset(self::class::$extra_methods[$lowerClass]);
         }
     }
 
@@ -328,7 +328,7 @@ trait CustomMethods
      */
     protected function addWrapperMethod($method, $wrap)
     {
-        self::$extra_methods[strtolower(static::class)][strtolower($method)] = [
+        self::class::$extra_methods[strtolower(static::class)][strtolower($method)] = [
             'wrap' => $wrap,
             'method' => $method
         ];
@@ -343,7 +343,7 @@ trait CustomMethods
      */
     protected function addCallbackMethod($method, $callback)
     {
-        self::$extra_methods[strtolower(static::class)][strtolower($method)] = [
+        self::class::$extra_methods[strtolower(static::class)][strtolower($method)] = [
             'callback' => $callback,
         ];
     }
diff --git a/src/Core/Extensible.php b/src/Core/Extensible.php
index 91bf23ce2..ff7f73898 100644
--- a/src/Core/Extensible.php
+++ b/src/Core/Extensible.php
@@ -191,7 +191,7 @@ trait Extensible
         $subclasses = ClassInfo::subclassesFor($class);
         $subclasses[] = $class;
         foreach ($subclasses as $subclass) {
-            unset(self::$extra_methods[strtolower($subclass)]);
+            unset(self::class::$extra_methods[strtolower($subclass)]);
         }
 
         Config::modify()
@@ -248,7 +248,7 @@ trait Extensible
         $subclasses = ClassInfo::subclassesFor($class);
         $subclasses[] = $class;
         foreach ($subclasses as $subclass) {
-            unset(self::$extra_methods[strtolower($subclass)]);
+            unset(self::class::$extra_methods[strtolower($subclass)]);
         }
     }
 
@@ -300,7 +300,7 @@ trait Extensible
         }
 
         // If this class is unextendable, NOP
-        if (in_array($class, self::$unextendable_classes)) {
+        if (in_array($class, self::class::$unextendable_classes)) {
             return null;
         }
 
@@ -364,7 +364,7 @@ trait Extensible
         }
 
         $requiredExtension = Extension::get_classname_without_arguments($requiredExtension);
-        $extensions = self::get_extensions($class);
+        $extensions = self::class::get_extensions($class);
         foreach ($extensions as $extension) {
             if (strcasecmp($extension ?? '', $requiredExtension ?? '') === 0) {
                 return true;
diff --git a/tests/php/Security/RememberLoginHashTest.php b/tests/php/Security/RememberLoginHashTest.php
index b62b68192..ced2991af 100644
--- a/tests/php/Security/RememberLoginHashTest.php
+++ b/tests/php/Security/RememberLoginHashTest.php
@@ -110,20 +110,25 @@ class RememberLoginHashTest extends SapphireTest
 
         $member = $this->objFromFixture(Member::class, 'main');
 
-        RememberLoginHash::config()->set('replace_token_during_session_renewal', $replaceToken);
+        Deprecation::withNoReplacement(
+            fn() => RememberLoginHash::config()->set('replace_token_during_session_renewal', $replaceToken)
+        );
 
         $hash = RememberLoginHash::generate($member);
         $oldToken = $hash->getToken();
         $oldHash = $hash->Hash;
 
-        Deprecation::withNoReplacement(fn() => $hash->renew());
+        // Fetch the token from the DB - otherwise we still have the token from when this was originally created
+        $storedHash = RememberLoginHash::get()->find('ID', $hash->ID);
+
+        Deprecation::withNoReplacement(fn() => $storedHash->renew());
 
         if ($replaceToken) {
-            $this->assertNotEquals($oldToken, $hash->getToken());
-            $this->assertNotEquals($oldHash, $hash->Hash);
+            $this->assertNotEquals($oldToken, $storedHash->getToken());
+            $this->assertNotEquals($oldHash, $storedHash->Hash);
         } else {
-            $this->assertEmpty($hash->getToken());
-            $this->assertEquals($oldHash, $hash->Hash);
+            $this->assertEmpty($storedHash->getToken());
+            $this->assertEquals($oldHash, $storedHash->Hash);
         }
     }