diff --git a/4dev/tests/CoreLibsCheckPhpVersionTest.php b/4dev/tests/CoreLibsCheckPhpVersionTest.php
index b6b75273..113a5e14 100644
--- a/4dev/tests/CoreLibsCheckPhpVersionTest.php
+++ b/4dev/tests/CoreLibsCheckPhpVersionTest.php
@@ -11,7 +11,7 @@ use PHPUnit\Framework\TestCase;
  * @coversDefaultClass \CoreLibs\Check\PHPVersion
  * @testdox \CoreLibs\Check\PHPVersion method tests
  */
-final class CoreLibsCheckPHPVersionTest extends TestCase
+final class CoreLibsCheckPhpVersionTest extends TestCase
 {
 	/**
 	 * NOTE: The checks must be adapted to the PHP version or they will fail
diff --git a/4dev/tests/CoreLibsConvertJsonTest.php b/4dev/tests/CoreLibsConvertJsonTest.php
index f00ed09a..1ae8d5bf 100644
--- a/4dev/tests/CoreLibsConvertJsonTest.php
+++ b/4dev/tests/CoreLibsConvertJsonTest.php
@@ -11,7 +11,7 @@ use PHPUnit\Framework\TestCase;
  * @coversDefaultClass \CoreLibs\Convert\Json
  * @testdox \CoreLibs\Convert\Json method tests
  */
-final class CoreLibsCheckJsonTest extends TestCase
+final class CoreLibsConvertJsonTest extends TestCase
 {
 
 	/**
diff --git a/4dev/tests/CoreLibsDBIOTest.php b/4dev/tests/CoreLibsDBIOTest.php
index 86f6129c..a2354f30 100644
--- a/4dev/tests/CoreLibsDBIOTest.php
+++ b/4dev/tests/CoreLibsDBIOTest.php
@@ -2646,7 +2646,8 @@ final class CoreLibsDBIOTest extends TestCase
 					'level' => 'error',
 					'id' => '51',
 					'error' => 'Max query call needs to be set to at least 1',
-					'source' => 'main::run::run::run::run::run::run::runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall',
+					// run:: can be +1 if called in set and not direct
+					'source' => "/^main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
 					'pg_error' => '',
 					'msg' => '',
 				]
diff --git a/4dev/tests/CoreLibsDebugSupportTest.php b/4dev/tests/CoreLibsDebugSupportTest.php
index 349ed94a..891e9ae6 100644
--- a/4dev/tests/CoreLibsDebugSupportTest.php
+++ b/4dev/tests/CoreLibsDebugSupportTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:disable Generic.Files.LineLength
 
 declare(strict_types=1);
 
@@ -255,18 +255,27 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerMethodList
-	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
+	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
 	 * @testdox getCallerMethodList check if it returns $expected [$_dataName]
 	 *
 	 * @param array $expected
 	 * @return void
 	 */
-	public function testGetCallerMethodList(array $expected): void
+	public function testGetCallerMethodList(array $expected, array $expected_group): void
 	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Debug\Support::getCallerMethodList()
-		);
+		$compare = \CoreLibs\Debug\Support::getCallerMethodList();
+		// if we direct call we have 10, if we call as folder we get 11
+		if (count($compare) == 10) {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Debug\Support::getCallerMethodList()
+			);
+		} else {
+			$this->assertEquals(
+				$expected_group,
+				\CoreLibs\Debug\Support::getCallerMethodList()
+			);
+		}
 	}
 
 	/**