diff --git a/config/phpcs.xml b/config/phpcs.xml
index 771659aa31..492d13a5d3 100644
--- a/config/phpcs.xml
+++ b/config/phpcs.xml
@@ -30,8 +30,4 @@
         <severity>0</severity>
     </rule>
 
-    <rule ref="Spryker.Commenting.DocBlockReturnSelf">
-        <severity>0</severity>
-    </rule>
-
 </ruleset>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index bb58a2f288..2f3ed87a1a 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -470,11 +470,6 @@ parameters:
 			count: 1
 			path: src/Propel/Runtime/ActiveQuery/Criteria.php
 
-		-
-			message: "#^Method Propel\\\\Runtime\\\\ActiveQuery\\\\Criteria\\:\\:_endif\\(\\) should return \\$this\\(Propel\\\\Runtime\\\\ActiveQuery\\\\Criteria\\) but returns Propel\\\\Runtime\\\\ActiveQuery\\\\Criteria\\|Propel\\\\Runtime\\\\Util\\\\PropelConditionalProxy\\.$#"
-			count: 1
-			path: src/Propel/Runtime/ActiveQuery/Criteria.php
-
 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1
@@ -530,11 +525,6 @@ parameters:
 			count: 1
 			path: src/Propel/Runtime/ActiveQuery/ModelCriteria.php
 
-		-
-			message: "#^Method Propel\\\\Runtime\\\\ActiveQuery\\\\ModelCriteria\\:\\:getPrimaryCriteria\\(\\) should return \\$this\\(Propel\\\\Runtime\\\\ActiveQuery\\\\ModelCriteria\\)\\|null but returns Propel\\\\Runtime\\\\ActiveQuery\\\\ModelCriteria\\|null\\.$#"
-			count: 1
-			path: src/Propel/Runtime/ActiveQuery/ModelCriteria.php
-
 		-
 			message: "#^Call to an undefined method Propel\\\\Runtime\\\\ActiveQuery\\\\Criteria\\:\\:addSelfSelectColumns\\(\\)\\.$#"
 			count: 1
diff --git a/resources/dtd/database.dtd b/resources/dtd/database.dtd
index 684ec39d5e..ae83f9169a 100644
--- a/resources/dtd/database.dtd
+++ b/resources/dtd/database.dtd
@@ -1,6 +1,5 @@
 <!--
     Propel XML database schema DTD
-    $Id: database.dtd,v 1.7 2005/03/30 11:38:18 hlellelid Exp $
 
     This is based very closely on the schema DTD for Torque, but
     some differences do exist.
diff --git a/src/Propel/Generator/Behavior/QueryCache/QueryCacheBehavior.php b/src/Propel/Generator/Behavior/QueryCache/QueryCacheBehavior.php
index 745b9a3fea..7c41c0d9e6 100644
--- a/src/Propel/Generator/Behavior/QueryCache/QueryCacheBehavior.php
+++ b/src/Propel/Generator/Behavior/QueryCache/QueryCacheBehavior.php
@@ -325,7 +325,6 @@ public function doCount(ConnectionInterface \$con = null)
             \$this->cacheStore(\$key, \$sql);
     }
 
-
     return \$con->getDataFetcher(\$stmt);
 }
 ";
diff --git a/src/Propel/Generator/Builder/Util/SchemaReader.php b/src/Propel/Generator/Builder/Util/SchemaReader.php
index 96fb9cef3c..db0b6b00fd 100644
--- a/src/Propel/Generator/Builder/Util/SchemaReader.php
+++ b/src/Propel/Generator/Builder/Util/SchemaReader.php
@@ -96,20 +96,18 @@ class SchemaReader
     private $defaultPackage;
 
     /**
-     * @var bool
-     */
-    private $firstPass;
-
-    /**
+     * @deprecated Unused.
+     *
      * @var string
      */
     private $encoding;
 
     /**
-     * @var array
-     * two-dimensional array,
+     * Two-dimensional array,
      * first dimension is for schemas(key is the path to the schema file),
-     * second is for tags within the schema
+     * second is for tags within the schema.
+     *
+     * @var array
      */
     private $schemasTagsStack = [];
 
@@ -124,7 +122,6 @@ public function __construct(?PlatformInterface $defaultPlatform = null, $default
     {
         $this->schema = new Schema($defaultPlatform);
         $this->defaultPackage = $defaultPackage;
-        $this->firstPass = true;
         $this->encoding = $encoding;
     }
 
diff --git a/src/Propel/Generator/Command/Console/Input/ArrayInput.php b/src/Propel/Generator/Command/Console/Input/ArrayInput.php
index 9b3cf5d4c1..757fac0ba2 100644
--- a/src/Propel/Generator/Command/Console/Input/ArrayInput.php
+++ b/src/Propel/Generator/Command/Console/Input/ArrayInput.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * This file is part of the Symfony package.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
diff --git a/src/Propel/Generator/Util/BehaviorLocator.php b/src/Propel/Generator/Util/BehaviorLocator.php
index 112914d136..ef9ee75cde 100644
--- a/src/Propel/Generator/Util/BehaviorLocator.php
+++ b/src/Propel/Generator/Util/BehaviorLocator.php
@@ -35,6 +35,8 @@ class BehaviorLocator
     private $composerDir;
 
     /**
+     * @deprecated Unused.
+     *
      * @var \Propel\Generator\Config\GeneratorConfigInterface
      */
     private $generatorConfig;
diff --git a/src/Propel/Runtime/ActiveQuery/Criteria.php b/src/Propel/Runtime/ActiveQuery/Criteria.php
index 559385df7d..6f9beb1a57 100644
--- a/src/Propel/Runtime/ActiveQuery/Criteria.php
+++ b/src/Propel/Runtime/ActiveQuery/Criteria.php
@@ -771,11 +771,13 @@ public function get($key)
      * @param string $key
      * @param mixed $value
      *
-     * @return $this Instance of self.
+     * @return $this
      */
     public function put($key, $value)
     {
-        return $this->add($key, $value);
+        $this->add($key, $value);
+
+        return $this;
     }
 
     /**
@@ -936,7 +938,9 @@ public function addJoin($left, $right, $joinType = null)
                 $conditions[] = $condition;
             }
 
-            return $this->addMultipleJoin($conditions, $joinType);
+            $this->addMultipleJoin($conditions, $joinType);
+
+            return $this;
         }
 
         $join = new Join();
@@ -966,7 +970,9 @@ public function addJoin($left, $right, $joinType = null)
 
         $join->setJoinType($joinType);
 
-        return $this->addJoinObject($join);
+        $this->addJoinObject($join);
+
+        return $this;
     }
 
     /**
@@ -1042,7 +1048,9 @@ public function addMultipleJoin($conditions, $joinType = null)
         $join->setJoinType($joinType);
         $join->setJoinCondition($joinCondition);
 
-        return $this->addJoinObject($join);
+        $this->addJoinObject($join);
+
+        return $this;
     }
 
     /**
@@ -1886,10 +1894,14 @@ public function addUsingOperator($p1, $value = null, $operator = null, $preferCo
         if ($this->defaultCombineOperator === Criteria::LOGICAL_OR) {
             $this->defaultCombineOperator = Criteria::LOGICAL_AND;
 
-            return $this->addOr($p1, $value, $operator, $preferColumnCondition);
+            $this->addOr($p1, $value, $operator, $preferColumnCondition);
+
+            return $this;
         }
 
-        return $this->addAnd($p1, $value, $operator, $preferColumnCondition);
+        $this->addAnd($p1, $value, $operator, $preferColumnCondition);
+
+        return $this;
     }
 
     /**
@@ -2808,7 +2820,7 @@ public function _elseif($cond)
      *
      * @throws \Propel\Runtime\Exception\LogicException
      *
-     * @return \Propel\Runtime\Util\PropelConditionalProxy|$this
+     * @return \Propel\Runtime\Util\PropelConditionalProxy|static
      */
     public function _else()
     {
@@ -2825,7 +2837,7 @@ public function _else()
      *
      * @throws \Propel\Runtime\Exception\LogicException
      *
-     * @return $this
+     * @return $this|\Propel\Runtime\ActiveQuery\Criteria
      */
     public function _endif()
     {
diff --git a/src/Propel/Runtime/ActiveQuery/ModelCriteria.php b/src/Propel/Runtime/ActiveQuery/ModelCriteria.php
index 39779810c7..29258a2643 100644
--- a/src/Propel/Runtime/ActiveQuery/ModelCriteria.php
+++ b/src/Propel/Runtime/ActiveQuery/ModelCriteria.php
@@ -154,7 +154,9 @@ public function condition($conditionName, $clause, $value = null, $bindingType =
      */
     public function filterBy($column, $value, $comparison = Criteria::EQUAL)
     {
-        return $this->add($this->getRealColumnName($column), $value, $comparison);
+        $this->add($this->getRealColumnName($column), $value, $comparison);
+
+        return $this;
     }
 
     /**
@@ -882,7 +884,7 @@ public function setPrimaryCriteria(ModelCriteria $criteria, Join $previousJoin)
     /**
      * Gets the primary criteria for this secondary Criteria
      *
-     * @return $this|null The primary criteria
+     * @return \Propel\Runtime\ActiveQuery\ModelCriteria|null The primary criteria
      */
     public function getPrimaryCriteria()
     {
@@ -2240,7 +2242,9 @@ public static function getShortName($fullyQualifiedClassName)
      */
     public function addUsingAlias($column, $value = null, $operator = null)
     {
-        return $this->addUsingOperator($this->getAliasedColName($column), $value, $operator);
+        $this->addUsingOperator($this->getAliasedColName($column), $value, $operator);
+
+        return $this;
     }
 
     /**
diff --git a/src/Propel/Runtime/ActiveQuery/ModelJoin.php b/src/Propel/Runtime/ActiveQuery/ModelJoin.php
index 4a3631fdff..687eb81210 100644
--- a/src/Propel/Runtime/ActiveQuery/ModelJoin.php
+++ b/src/Propel/Runtime/ActiveQuery/ModelJoin.php
@@ -156,7 +156,9 @@ public function isPrimary()
      */
     public function setRelationAlias($relationAlias)
     {
-        return $this->setRightTableAlias($relationAlias);
+        $this->setRightTableAlias($relationAlias);
+
+        return $this;
     }
 
     /**
diff --git a/tests/Propel/Tests/Bookstore/AuthorCollection.php b/tests/Propel/Tests/Bookstore/AuthorCollection.php
index 6d12f5a8e4..66fd692465 100644
--- a/tests/Propel/Tests/Bookstore/AuthorCollection.php
+++ b/tests/Propel/Tests/Bookstore/AuthorCollection.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Bookstore;
 
 use Propel\Runtime\Collection\ObjectCollection;
diff --git a/tests/Propel/Tests/BookstoreLoggingTest.php b/tests/Propel/Tests/BookstoreLoggingTest.php
index a76972b665..efd8b52f3b 100644
--- a/tests/Propel/Tests/BookstoreLoggingTest.php
+++ b/tests/Propel/Tests/BookstoreLoggingTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
diff --git a/tests/Propel/Tests/BookstoreTest.php b/tests/Propel/Tests/BookstoreTest.php
index 834e318f51..8a19a046d9 100644
--- a/tests/Propel/Tests/BookstoreTest.php
+++ b/tests/Propel/Tests/BookstoreTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
diff --git a/tests/Propel/Tests/CharacterEncodingTest.php b/tests/Propel/Tests/CharacterEncodingTest.php
index 892b62de47..99b41ec7b3 100644
--- a/tests/Propel/Tests/CharacterEncodingTest.php
+++ b/tests/Propel/Tests/CharacterEncodingTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
@@ -38,13 +36,6 @@
  */
 class CharacterEncodingTest extends BookstoreTestBase
 {
-    /**
-     * Database adapter.
-     *
-     * @var DBAdapter
-     */
-    private $adapter;
-
     /**
      * @throws \Exception
      *
diff --git a/tests/Propel/Tests/Common/Config/ConfigTestCase.php b/tests/Propel/Tests/Common/Config/ConfigTestCase.php
index 4dbe49203d..38e4d04e44 100644
--- a/tests/Propel/Tests/Common/Config/ConfigTestCase.php
+++ b/tests/Propel/Tests/Common/Config/ConfigTestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config;
@@ -21,11 +19,13 @@
 class ConfigTestCase extends TestCase
 {
     /**
-     * @var null
-     * Symfony\Component\Filesystem\Filesystem instance
+     * @var \Symfony\Component\Filesystem\Filesystem|null
      */
     private $fileSystem;
 
+    /**
+     * @return \Symfony\Component\Filesystem\Filesystem
+     */
     public function getFilesystem()
     {
         if (null === $this->fileSystem) {
diff --git a/tests/Propel/Tests/Common/Config/ConfigurationManagerTest.php b/tests/Propel/Tests/Common/Config/ConfigurationManagerTest.php
index 33bc307d56..d1ce1b94a5 100644
--- a/tests/Propel/Tests/Common/Config/ConfigurationManagerTest.php
+++ b/tests/Propel/Tests/Common/Config/ConfigurationManagerTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config;
@@ -114,6 +112,7 @@ public function testNotExistingConfigFileLoadsDefaultSettingsAndDoesNotThrowExce
         $this->getFilesystem()->dumpFile('doctrine.yaml', $yamlConf);
 
         $manager = new TestableConfigurationManager();
+        $this->assertInstanceOf(ConfigurationManager::class, $manager);
     }
 
     /**
@@ -154,7 +153,7 @@ public function testUnsupportedExtensionsAreIgnored()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      *
      * @exceptionMessage Propel expects only one configuration file
      *
@@ -177,7 +176,7 @@ public function testMoreThanOneConfigurationFileInSameDirectoryThrowsException()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      *
      * @exceptionMessage Propel expects only one configuration file
      *
@@ -385,7 +384,7 @@ public function testMergeExtraProperties()
     }
 
     /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      * @expectedExceptionMessage Unrecognized options "foo, bar" under "propel"
      *
      * @return void
@@ -439,7 +438,7 @@ classname: Propel\Runtime\Connection\ConnectionWrapper
     }
 
     /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      * @expectedExceptionMessage The child node "database" at path "propel" must be configured
      *
      * @return void
@@ -458,7 +457,7 @@ public function testNotDefineDatabaseSectionTrowsException()
     }
 
     /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      * @expectedExceptionMessage Dots are not allowed in connection names
      *
      * @return void
@@ -648,7 +647,7 @@ classname: Propel\Runtime\Connection\DebugPDO
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage Invalid configuration property name
      *
      * @return void
diff --git a/tests/Propel/Tests/Common/Config/DataProviderTrait.php b/tests/Propel/Tests/Common/Config/DataProviderTrait.php
index 039fd7124d..730c805615 100644
--- a/tests/Propel/Tests/Common/Config/DataProviderTrait.php
+++ b/tests/Propel/Tests/Common/Config/DataProviderTrait.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config;
@@ -352,7 +350,7 @@ public function providerForXmlToArrayConverterXmlInclusions()
             'table' => [
                 'name' => 'book',
                 'phpName' => 'Book',
-            ]
+            ],
         ];
 
         return [
diff --git a/tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php b/tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php
index c37d618738..bee9f3f2bf 100644
--- a/tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php
+++ b/tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config\Loader;
@@ -192,7 +190,7 @@ public function testResolveReplaceWithoutCasting()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage Parameter 'baz' not found in configuration file.
      *
      * @return void
@@ -203,7 +201,7 @@ public function testResolveThrowsExceptionIfInvalidPlaceholder()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage Parameter 'foobar' not found in configuration file.
      *
      * @return void
@@ -214,7 +212,7 @@ public function testResolveThrowsExceptionIfNonExistentParameter()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\RuntimeException
+     * @expectedException \Propel\Common\Config\Exception\RuntimeException
      * @expectedExceptionMessage Circular reference detected for parameter 'bar'.
      *
      * @return void
@@ -225,7 +223,7 @@ public function testResolveThrowsRuntimeExceptionIfCircularReference()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\RuntimeException
+     * @expectedException \Propel\Common\Config\Exception\RuntimeException
      * @expectedExceptionMessage Circular reference detected for parameter 'bar'.
      *
      * @return void
diff --git a/tests/Propel/Tests/Common/Config/Loader/IniFileLoaderTest.php b/tests/Propel/Tests/Common/Config/Loader/IniFileLoaderTest.php
index 3872c169e1..d1969ffbb3 100644
--- a/tests/Propel/Tests/Common/Config/Loader/IniFileLoaderTest.php
+++ b/tests/Propel/Tests/Common/Config/Loader/IniFileLoaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config\Loader;
@@ -68,7 +66,7 @@ public function testIniFileDoesNotExist()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage The configuration file 'nonvalid.ini' has invalid content.
      *
      * @return void
@@ -228,7 +226,7 @@ public function testSectionZero()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InputOutputException
+     * @expectedException \Propel\Common\Config\Exception\InputOutputException
      * @expectedExceptionMessage You don't have permissions to access configuration file notreadable.ini.
      *
      * @requires OS ^(?!Win.*)
diff --git a/tests/Propel/Tests/Common/Config/Loader/JsonFileLoaderTest.php b/tests/Propel/Tests/Common/Config/Loader/JsonFileLoaderTest.php
index 7877e497f6..66ae919bc1 100644
--- a/tests/Propel/Tests/Common/Config/Loader/JsonFileLoaderTest.php
+++ b/tests/Propel/Tests/Common/Config/Loader/JsonFileLoaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config\Loader;
@@ -67,7 +65,7 @@ public function testJsonFileDoesNotExist()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\JsonParseException
+     * @expectedException \Propel\Common\Config\Exception\JsonParseException
      *
      * @return void
      */
@@ -97,7 +95,7 @@ public function testJsonFileIsEmpty()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InputOutputException
+     * @expectedException \Propel\Common\Config\Exception\InputOutputException
      * @expectedExceptionMessage You don't have permissions to access configuration file notreadable.json.
      *
      * @requires OS ^(?!Win.*)
diff --git a/tests/Propel/Tests/Common/Config/Loader/PhpFileLoaderTest.php b/tests/Propel/Tests/Common/Config/Loader/PhpFileLoaderTest.php
index b76e0979f0..4a5c8f2c7e 100644
--- a/tests/Propel/Tests/Common/Config/Loader/PhpFileLoaderTest.php
+++ b/tests/Propel/Tests/Common/Config/Loader/PhpFileLoaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config\Loader;
@@ -68,7 +66,7 @@ public function testPhpFileDoesNotExist()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage The configuration file 'nonvalid.php' has invalid content.
      *
      * @return void
@@ -85,7 +83,7 @@ public function testPhpFileHasInvalidContent()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage The configuration file 'empty.php' has invalid content.
      *
      * @return void
@@ -99,7 +97,7 @@ public function testPhpFileIsEmpty()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InputOutputException
+     * @expectedException \Propel\Common\Config\Exception\InputOutputException
      * @expectedExceptionMessage You don't have permissions to access configuration file notreadable.php.
      *
      * @requires OS ^(?!Win.*)
diff --git a/tests/Propel/Tests/Common/Config/Loader/XmlFileLoaderTest.php b/tests/Propel/Tests/Common/Config/Loader/XmlFileLoaderTest.php
index 16b0e3d135..99874fe248 100644
--- a/tests/Propel/Tests/Common/Config/Loader/XmlFileLoaderTest.php
+++ b/tests/Propel/Tests/Common/Config/Loader/XmlFileLoaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config\Loader;
@@ -69,7 +67,7 @@ public function testXmlFileDoesNotExist()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InvalidArgumentException
+     * @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
      * @expectedExceptionMessage Invalid xml content
      *
      * @return void
@@ -100,7 +98,7 @@ public function testXmlFileIsEmpty()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InputOutputException
+     * @expectedException \Propel\Common\Config\Exception\InputOutputException
      * @expectedExceptionMessage You don't have permissions to access configuration file notreadable.xml.
      *
      * @requires OS ^(?!Win.*)
diff --git a/tests/Propel/Tests/Common/Config/Loader/YamlFileLoaderTest.php b/tests/Propel/Tests/Common/Config/Loader/YamlFileLoaderTest.php
index 455c6e1712..f4e194a09b 100644
--- a/tests/Propel/Tests/Common/Config/Loader/YamlFileLoaderTest.php
+++ b/tests/Propel/Tests/Common/Config/Loader/YamlFileLoaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config\Loader;
@@ -68,7 +66,7 @@ public function testYamlFileDoesNotExist()
     }
 
     /**
-     * @expectedException Symfony\Component\Yaml\Exception\ParseException
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      * @expectedExceptionMessage Unable to parse
      *
      * @return void
@@ -98,7 +96,7 @@ public function testYamlFileIsEmpty()
     }
 
     /**
-     * @expectedException Propel\Common\Config\Exception\InputOutputException
+     * @expectedException \Propel\Common\Config\Exception\InputOutputException
      * @expectedExceptionMessage You don't have permissions to access configuration file notreadable.yaml.
      *
      * @requires OS ^(?!Win.*)
diff --git a/tests/Propel/Tests/Common/Config/XmlToArrayConverterTest.php b/tests/Propel/Tests/Common/Config/XmlToArrayConverterTest.php
index 1ad649d63c..4efc47c113 100644
--- a/tests/Propel/Tests/Common/Config/XmlToArrayConverterTest.php
+++ b/tests/Propel/Tests/Common/Config/XmlToArrayConverterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Config;
diff --git a/tests/Propel/Tests/Common/Pluralizer/EnglishPluralizerTest.php b/tests/Propel/Tests/Common/Pluralizer/EnglishPluralizerTest.php
index a5e3afc588..5d1484c887 100644
--- a/tests/Propel/Tests/Common/Pluralizer/EnglishPluralizerTest.php
+++ b/tests/Propel/Tests/Common/Pluralizer/EnglishPluralizerTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Pluralizer;
diff --git a/tests/Propel/Tests/Common/Util/SetColumnConverterTest.php b/tests/Propel/Tests/Common/Util/SetColumnConverterTest.php
index 154de01107..091f9c30ef 100644
--- a/tests/Propel/Tests/Common/Util/SetColumnConverterTest.php
+++ b/tests/Propel/Tests/Common/Util/SetColumnConverterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Common\Util;
diff --git a/tests/Propel/Tests/FieldnameRelatedTest.php b/tests/Propel/Tests/FieldnameRelatedTest.php
index a78fb1add2..5b74a2471d 100644
--- a/tests/Propel/Tests/FieldnameRelatedTest.php
+++ b/tests/Propel/Tests/FieldnameRelatedTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
diff --git a/tests/Propel/Tests/Generator/Behavior/AddClass/AddClassBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/AddClass/AddClassBehaviorTest.php
index be2b1fbe36..a6191897b5 100644
--- a/tests/Propel/Tests/Generator/Behavior/AddClass/AddClassBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/AddClass/AddClassBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\AddClass;
diff --git a/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorTest.php
index 8df3fe817b..ad34bbd4d0 100644
--- a/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\AggregateColumn;
diff --git a/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorWithSchemaTest.php b/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorWithSchemaTest.php
index d51cc0db3c..dadd5f2e61 100644
--- a/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorWithSchemaTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorWithSchemaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\AggregateColumn;
diff --git a/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnsBehaviorTestClasses.php b/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnsBehaviorTestClasses.php
index e531e6bd49..0e38127749 100644
--- a/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnsBehaviorTestClasses.php
+++ b/tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnsBehaviorTestClasses.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\AggregateColumn;
 
 use Propel\Runtime\ActiveQuery\Criteria;
diff --git a/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorObjectBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorObjectBuilderModifierTest.php
index 7aee8ab708..92fe8662ea 100644
--- a/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorObjectBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorObjectBuilderModifierTest.php
@@ -9,6 +9,12 @@
  * @license MIT License
  */
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\Archivable;
 
 use ArchivableTest10;
diff --git a/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorQueryBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorQueryBuilderModifierTest.php
index 82afef1c79..82d3bb46b3 100644
--- a/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorQueryBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorQueryBuilderModifierTest.php
@@ -9,6 +9,12 @@
  * @license MIT License
  */
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\Archivable;
 
 use ArchivableTest100;
diff --git a/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorTest.php
index 7c3be49798..2108e954c4 100644
--- a/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorTest.php
@@ -9,6 +9,12 @@
  * @license MIT License
  */
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\Archivable;
 
 use Map\ArchivableTest1ArchiveTableMap;
@@ -234,9 +240,14 @@ public function testDatabaseLevelBehavior()
 EOF;
         $builder = new QuickBuilder();
         $builder->setSchema($schema);
-        $builder->getSQL();
+        $sql = $builder->getSQL();
+
+        $this->assertNotEmpty($sql);
     }
 
+    /**
+     * @return array
+     */
     public function tablePrefixDataProvider()
     {
         $schema = <<<XML
diff --git a/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchive.php b/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchive.php
index 0ff5bf7d36..a9edce8949 100644
--- a/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchive.php
+++ b/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchive.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\Archivable;
 
 class FooArchive
diff --git a/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveCollection.php b/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveCollection.php
index 1d73272933..61d9138033 100644
--- a/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveCollection.php
+++ b/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveCollection.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\Archivable;
 
 class FooArchiveCollection
diff --git a/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveQuery.php b/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveQuery.php
index 0c5f77cea2..15f99417c2 100644
--- a/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveQuery.php
+++ b/tests/Propel/Tests/Generator/Behavior/Archivable/FooArchiveQuery.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\Archivable;
 
 class FooArchiveQuery
diff --git a/tests/Propel/Tests/Generator/Behavior/AutoAddPk/AutoAddPkBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/AutoAddPk/AutoAddPkBehaviorTest.php
index b3a3ce53a9..66a6970895 100644
--- a/tests/Propel/Tests/Generator/Behavior/AutoAddPk/AutoAddPkBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/AutoAddPk/AutoAddPkBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\AutoAddPk;
diff --git a/tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php b/tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php
index bc4262dbd0..e4d8f92ff8 100644
--- a/tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
index 91e68714b1..f0f4d122a3 100644
--- a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithBehaviorExclusionTest.php b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithBehaviorExclusionTest.php
index f3f8f1a85b..a57a07b4e9 100644
--- a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithBehaviorExclusionTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithBehaviorExclusionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithSchemaTest.php b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithSchemaTest.php
index 1c69f6bec2..993b5da82b 100644
--- a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithSchemaTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithSchemaTest.php
@@ -1,12 +1,9 @@
 <?php
 
-/*
- *	$Id: ConcreteInheritanceBehaviorTest.php 1458 2010-01-13 16:09:51Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehaviorTest.php
index 178a5638eb..d67493be97 100644
--- a/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehaviorTest.php
@@ -1,12 +1,9 @@
 <?php
 
-/*
- *	$Id: ConcreteInheritanceBehaviorTest.php 1458 2010-01-13 16:09:51Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\ConcreteInheritance;
diff --git a/tests/Propel/Tests/Generator/Behavior/Delegate/DelegateBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Delegate/DelegateBehaviorTest.php
index f769a4e376..563a35e687 100644
--- a/tests/Propel/Tests/Generator/Behavior/Delegate/DelegateBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Delegate/DelegateBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Delegate;
diff --git a/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php
index 89aae05838..66185640b1 100644
--- a/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php
@@ -1,23 +1,28 @@
 <?php
 
-/*
- *	$Id: VersionableBehaviorTest.php 1460 2010-01-17 22:36:48Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\I18n;
 
-use Propel\Tests\Bookstore\Behavior\Movie;
-use Propel\Tests\Bookstore\Behavior\MovieQuery;
-use Propel\Tests\Bookstore\Behavior\MovieI18nQuery;
+use I18nBehaviorTest1;
+use I18nBehaviorTest1I18n;
+use I18nBehaviorTest1I18nQuery;
+use I18nBehaviorTest1Query;
+use I18nBehaviorTest2;
+use I18nBehaviorTestLocalColumn;
+use I18nBehaviorTestLocalColumnI18n;
+use Movie;
+use MovieI18nQuery;
+use MovieQuery;
 use Propel\Generator\Util\QuickBuilder;
-use Propel\Generator\Behavior\I18n\I18nBehavior;
-use Propel\Runtime\Propel;
 use Propel\Tests\TestCase;
+use Toy;
+use ToyI18nQuery;
+use ToyQuery;
 
 /**
  * Tests for I18nBehavior class object modifier
@@ -26,6 +31,9 @@
  */
 class I18nBehaviorObjectBuilderModifierTest extends TestCase
 {
+    /**
+     * @return void
+     */
     public function setUp(): void
     {
         if (!class_exists('\I18nBehaviorTest1')) {
@@ -91,62 +99,80 @@ public function setUp(): void
         }
     }
 
+    /**
+     * @return void
+     */
     public function testPostDeleteEmulatesOnDeleteCascade()
     {
-        \I18nBehaviorTest1Query::create()->deleteAll();
-        \I18nBehaviorTest1I18nQuery::create()->deleteAll();
-        $o = new \I18nBehaviorTest1();
+        I18nBehaviorTest1Query::create()->deleteAll();
+        I18nBehaviorTest1I18nQuery::create()->deleteAll();
+        $o = new I18nBehaviorTest1();
         $o->setFoo(123);
         $o->setLocale('en_US');
         $o->setBar('hello');
         $o->setLocale('fr_FR');
         $o->setBar('bonjour');
         $o->save();
-        $this->assertEquals(2, \I18nBehaviorTest1I18nQuery::create()->count());
+        $this->assertEquals(2, I18nBehaviorTest1I18nQuery::create()->count());
         $o->clearI18nBehaviorTest1I18ns();
         $o->delete();
-        $this->assertEquals(0, \I18nBehaviorTest1I18nQuery::create()->count());
+        $this->assertEquals(0, I18nBehaviorTest1I18nQuery::create()->count());
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationReturnsTranslationObject()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $translation = $o->getTranslation();
-        $this->assertTrue($translation instanceof \I18nBehaviorTest1I18n);
+        $this->assertTrue($translation instanceof I18nBehaviorTest1I18n);
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationOnNewObjectReturnsNewTranslation()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $translation = $o->getTranslation();
         $this->assertTrue($translation->isNew());
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationOnPersistedObjectReturnsNewTranslation()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->save();
         $translation = $o->getTranslation();
         $this->assertTrue($translation->isNew());
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationOnPersistedObjectWithTranslationReturnsExistingTranslation()
     {
-        $o = new \I18nBehaviorTest1();
-        $translation = new \I18nBehaviorTest1I18n();
+        $o = new I18nBehaviorTest1();
+        $translation = new I18nBehaviorTest1I18n();
         $o->addI18nBehaviorTest1I18n($translation);
         $o->save();
         $translation = $o->getTranslation();
         $this->assertFalse($translation->isNew());
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationAcceptsALocaleParameter()
     {
-        $o = new \I18nBehaviorTest1();
-        $translation1 = new \I18nBehaviorTest1I18n();
+        $o = new I18nBehaviorTest1();
+        $translation1 = new I18nBehaviorTest1I18n();
         $translation1->setLocale('en_US');
         $o->addI18nBehaviorTest1I18n($translation1);
-        $translation2 = new \I18nBehaviorTest1I18n();
+        $translation2 = new I18nBehaviorTest1I18n();
         $translation2->setLocale('fr_FR');
         $o->addI18nBehaviorTest1I18n($translation2);
         $o->save();
@@ -154,38 +180,47 @@ public function testGetTranslationAcceptsALocaleParameter()
         $this->assertEquals($translation2, $o->getTranslation('fr_FR'));
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationSetsTheLocaleOnTheTranslation()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->save();
         $translation = $o->getTranslation();
         $this->assertEquals('en_US', $translation->getLocale());
-        $o = new \I18nBehaviorTest2();
+        $o = new I18nBehaviorTest2();
         $o->save();
         $translation = $o->getTranslation();
         $this->assertEquals('fr_FR', $translation->getLocale());
     }
 
+    /**
+     * @return void
+     */
     public function testGetTranslationUsesInternalCollectionIfAvailable()
     {
-        $o = new \I18nBehaviorTest1();
-        $translation1 = new \I18nBehaviorTest1I18n();
+        $o = new I18nBehaviorTest1();
+        $translation1 = new I18nBehaviorTest1I18n();
         $translation1->setLocale('en_US');
         $o->addI18nBehaviorTest1I18n($translation1);
-        $translation2 = new \I18nBehaviorTest1I18n();
+        $translation2 = new I18nBehaviorTest1I18n();
         $translation2->setLocale('fr_FR');
         $o->addI18nBehaviorTest1I18n($translation2);
         $translation = $o->getTranslation('en_US');
         $this->assertEquals($translation1, $translation);
     }
 
+    /**
+     * @return void
+     */
     public function testRemoveTranslation()
     {
-        $o = new \I18nBehaviorTest1();
-        $translation1 = new \I18nBehaviorTest1I18n();
+        $o = new I18nBehaviorTest1();
+        $translation1 = new I18nBehaviorTest1I18n();
         $translation1->setLocale('en_US');
         $o->addI18nBehaviorTest1I18n($translation1);
-        $translation2 = new \I18nBehaviorTest1I18n();
+        $translation2 = new I18nBehaviorTest1I18n();
         $translation2->setLocale('fr_FR');
         $translation2->setBar('bonjour');
         $o->addI18nBehaviorTest1I18n($translation2);
@@ -197,76 +232,106 @@ public function testRemoveTranslation()
         $this->assertNotEquals($translation->getBar(), $translation2->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testLocaleSetterAndGetterExist()
     {
         $this->assertTrue(method_exists('\I18nBehaviorTest1', 'setLocale'));
         $this->assertTrue(method_exists('\I18nBehaviorTest1', 'getLocale'));
     }
 
+    /**
+     * @return void
+     */
     public function testGetLocaleReturnsDefaultLocale()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $this->assertEquals('en_US', $o->getLocale());
-        $o = new \I18nBehaviorTest2();
+        $o = new I18nBehaviorTest2();
         $this->assertEquals('fr_FR', $o->getLocale());
     }
 
+    /**
+     * @return void
+     */
     public function testSetLocale()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->setLocale('fr_FR');
         $this->assertEquals('fr_FR', $o->getLocale());
     }
 
+    /**
+     * @return void
+     */
     public function testSetLocaleUsesDefaultLocale()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->setLocale('fr_FR');
         $o->setLocale();
         $this->assertEquals('en_US', $o->getLocale());
     }
 
+    /**
+     * @return void
+     */
     public function testLocaleSetterAndGetterAliasesExist()
     {
         $this->assertTrue(method_exists('\I18nBehaviorTest2', 'setCulture'));
         $this->assertTrue(method_exists('\I18nBehaviorTest2', 'getCulture'));
     }
 
+    /**
+     * @return void
+     */
     public function testGetLocaleAliasReturnsDefaultLocale()
     {
-        $o = new \I18nBehaviorTest2();
+        $o = new I18nBehaviorTest2();
         $this->assertEquals('fr_FR', $o->getCulture());
     }
 
+    /**
+     * @return void
+     */
     public function testSetLocaleAlias()
     {
-        $o = new \I18nBehaviorTest2();
+        $o = new I18nBehaviorTest2();
         $o->setCulture('en_US');
         $this->assertEquals('en_US', $o->getCulture());
     }
 
+    /**
+     * @return void
+     */
     public function testGetCurrentTranslationUsesDefaultLocale()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $t = $o->getCurrentTranslation();
         $this->assertEquals('en_US', $t->getLocale());
-        $o = new \I18nBehaviorTest2();
+        $o = new I18nBehaviorTest2();
         $t = $o->getCurrentTranslation();
         $this->assertEquals('fr_FR', $t->getLocale());
     }
 
+    /**
+     * @return void
+     */
     public function testGetCurrentTranslationUsesCurrentLocale()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->setLocale('fr_FR');
         $this->assertEquals('fr_FR', $o->getCurrentTranslation()->getLocale());
         $o->setLocale('pt_PT');
         $this->assertEquals('pt_PT', $o->getCurrentTranslation()->getLocale());
     }
 
+    /**
+     * @return void
+     */
     public function testI18nColumnGetterUsesCurrentTranslation()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $t1 = $o->getCurrentTranslation();
         $t1->setBar('hello');
         $o->setLocale('fr_FR');
@@ -279,9 +344,12 @@ public function testI18nColumnGetterUsesCurrentTranslation()
         $this->assertEquals('bonjour', $o->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testI18nColumnSetterUsesCurrentTranslation()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->setBar('hello');
         $o->setLocale('fr_FR');
         $o->setBar('bonjour');
@@ -291,11 +359,14 @@ public function testI18nColumnSetterUsesCurrentTranslation()
         $this->assertEquals('bonjour', $o->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testTranslationsArePersisted()
     {
-        $o = new \I18nBehaviorTest1();
+        $o = new I18nBehaviorTest1();
         $o->save();
-        $count = \I18nBehaviorTest1I18nQuery::create()
+        $count = I18nBehaviorTest1I18nQuery::create()
             ->filterById($o->getId())
             ->count();
         $this->assertEquals(0, $count);
@@ -303,16 +374,19 @@ public function testTranslationsArePersisted()
         $o->setLocale('fr_FR');
         $o->setBar('bonjour');
         $o->save();
-        $count = \I18nBehaviorTest1I18nQuery::create()
+        $count = I18nBehaviorTest1I18nQuery::create()
             ->filterById($o->getId())
             ->count();
         $this->assertEquals(2, $count);
     }
 
+    /**
+     * @return void
+     */
     public function testClearRemovesExistingTranslations()
     {
-        $o = new \I18nBehaviorTest1();
-        $translation1 = new \I18nBehaviorTest1I18n();
+        $o = new I18nBehaviorTest1();
+        $translation1 = new I18nBehaviorTest1I18n();
         $translation1->setBar('baz');
         $translation1->setLocale('fr_FR');
         $o->addI18nBehaviorTest1I18n($translation1);
@@ -322,19 +396,22 @@ public function testClearRemovesExistingTranslations()
         $this->assertEquals('', $t1->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testI18nWithRelations()
     {
-        \MovieQuery::create()->deleteAll();
-        $count = \MovieQuery::create()->count();
+        MovieQuery::create()->deleteAll();
+        $count = MovieQuery::create()->count();
         $this->assertEquals(0, $count, 'No movie before the test');
-        \ToyQuery::create()->deleteAll();
-        $count = \ToyQuery::create()->count();
+        ToyQuery::create()->deleteAll();
+        $count = ToyQuery::create()->count();
         $this->assertEquals(0, $count, 'No toy before the test');
-        \MovieI18nQuery::create()->deleteAll();
-        $count = \MovieI18nQuery::create()->count();
+        MovieI18nQuery::create()->deleteAll();
+        $count = MovieI18nQuery::create()->count();
         $this->assertEquals(0, $count, 'No i18n movies before the test');
 
-        $m = new \Movie();
+        $m = new Movie();
         $m->setLocale('en');
         $m->setTitle('V For Vendetta');
         $m->setLocale('fr');
@@ -345,37 +422,40 @@ public function testI18nWithRelations()
         $m->setLocale('fr');
         $this->assertEquals('V Pour Vendetta', $m->getTitle());
 
-        $t = new \Toy();
+        $t = new Toy();
         $t->setMovie($m);
         $t->save();
 
-        $count = \MovieQuery::create()->count();
+        $count = MovieQuery::create()->count();
         $this->assertEquals(1, $count, '1 movie');
-        $count = \ToyQuery::create()->count();
+        $count = ToyQuery::create()->count();
         $this->assertEquals(1, $count, '1 toy');
-        $count = \MovieI18nQuery::create()->count();
+        $count = MovieI18nQuery::create()->count();
         $this->assertEquals(2, $count, '2 i18n movies');
-        $count = \ToyI18nQuery::create()->count();
+        $count = ToyI18nQuery::create()->count();
         $this->assertEquals(0, $count, '0 i18n toys');
     }
 
+    /**
+     * @return void
+     */
     public function testI18nWithRelations2()
     {
-        \MovieI18nQuery::create()->deleteAll();
-        \MovieQuery::create()->deleteAll();
-        $count = \MovieQuery::create()->count();
+        MovieI18nQuery::create()->deleteAll();
+        MovieQuery::create()->deleteAll();
+        $count = MovieQuery::create()->count();
         $this->assertEquals(0, $count, 'No movie before the test');
-        \ToyQuery::create()->deleteAll();
-        $count = \ToyQuery::create()->count();
+        ToyQuery::create()->deleteAll();
+        $count = ToyQuery::create()->count();
         $this->assertEquals(0, $count, 'No toy before the test');
-        \ToyI18nQuery::create()->deleteAll();
-        $count = \ToyI18nQuery::create()->count();
+        ToyI18nQuery::create()->deleteAll();
+        $count = ToyI18nQuery::create()->count();
         $this->assertEquals(0, $count, 'No i18n toys before the test');
-        \MovieI18nQuery::create()->deleteAll();
-        $count = \MovieI18nQuery::create()->count();
+        MovieI18nQuery::create()->deleteAll();
+        $count = MovieI18nQuery::create()->count();
         $this->assertEquals(0, $count, 'No i18n movies before the test');
 
-        $t = new \Toy();
+        $t = new Toy();
         $t->setLocale('en');
         $t->setName('My Name');
         $t->setLocale('fr');
@@ -386,27 +466,30 @@ public function testI18nWithRelations2()
         $t->setLocale('fr');
         $this->assertEquals('Mon Nom', $t->getName());
 
-        $m = new \Movie();
+        $m = new Movie();
         $m->addToy($t);
         $m->save();
 
-        $count = \MovieQuery::create()->count();
+        $count = MovieQuery::create()->count();
         $this->assertEquals(1, $count, '1 movie');
-        $count = \ToyQuery::create()->count();
+        $count = ToyQuery::create()->count();
         $this->assertEquals(1, $count, '1 toy');
-        $count = \ToyI18nQuery::create()->count();
+        $count = ToyI18nQuery::create()->count();
         $this->assertEquals(2, $count, '2 i18n toys');
-        $count = \MovieI18nQuery::create()->count();
+        $count = MovieI18nQuery::create()->count();
         $this->assertEquals(0, $count, '0 i18n movies');
     }
 
+    /**
+     * @return void
+     */
     public function testUseLocalColumnParameter()
     {
-        $o = new \I18nBehaviorTestLocalColumn();
-        $translation1 = new \I18nBehaviorTestLocalColumnI18n();
+        $o = new I18nBehaviorTestLocalColumn();
+        $translation1 = new I18nBehaviorTestLocalColumnI18n();
         $translation1->setMyLang('en_US');
         $o->addI18nBehaviorTestLocalColumnI18n($translation1);
-        $translation2 = new \I18nBehaviorTestLocalColumnI18n();
+        $translation2 = new I18nBehaviorTestLocalColumnI18n();
         $translation2->setMyLang('fr_FR');
         $o->addI18nBehaviorTestLocalColumnI18n($translation2);
         $o->save();
diff --git a/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php
index 52d5fb00f4..d8c690d31f 100644
--- a/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
-/*
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\I18n;
diff --git a/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorTest.php
index 7dbc3d7f00..d57c29fdf5 100644
--- a/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\I18n;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable10.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable10.php
index 5fdc6d1b5d..ade3dc21fc 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable10.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable10.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\NestedSet\Fixtures;
 
 use NestedSetTable10;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable9.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable9.php
index 04bd08145e..45ea85ade3 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable9.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/Fixtures/PublicTable9.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Behavior\NestedSet\Fixtures;
 
 use NestedSetTable9;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
index 27bdc1f31a..bc65f0c1fe 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\NestedSet;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierWithScopeTest.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierWithScopeTest.php
index 091738cd49..0b0e779778 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierWithScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierWithScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\NestedSet;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierTest.php
index 8e2550ff19..eeb71e9bdc 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\NestedSet;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierWithScopeTest.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierWithScopeTest.php
index 86a6616f43..6297a73c11 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierWithScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierWithScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\NestedSet;
@@ -215,7 +213,17 @@ public function testAncestorsOf()
             ->ancestorsOf($t5)
             ->orderByBranch()
             ->find();
-        $coll = $this->buildCollection([$t1, $t3], 'ancestorsOf() filters by ancestors of the same scope');
+        $coll = $this->buildCollection([$t1, $t3]);
+        /*
+         * FIXME
+         * -    'model' => 'Table10'
+         * -    'fullyQualifiedModel' => '\Table10'
+         * -    'formatter' => null
+         * +    'model' => 'NestedSetTable10'
+         * +    'fullyQualifiedModel' => '\NestedSetTable10'
+         * +    'formatter' => Propel\Runtime\Formatter\ObjectFormatter Object (...)
+         */
+        //$this->assertEquals($coll, $objs, 'ancestorsOf() filters by ancestors of the same scope');
     }
 
     /**
@@ -244,7 +252,17 @@ public function testRootsOf()
             ->rootsOf($t5)
             ->orderByBranch()
             ->find();
-        $coll = $this->buildCollection([$t1, $t3, $t5], 'rootsOf() filters by ancestors of the same scope');
+        $coll = $this->buildCollection([$t1, $t3, $t5]);
+        /*
+         * FIXME
+         * -    'model' => 'Table10'
+         * -    'fullyQualifiedModel' => '\Table10'
+         * -    'formatter' => null
+         * +    'model' => 'NestedSetTable10'
+         * +    'fullyQualifiedModel' => '\NestedSetTable10'
+         * +    'formatter' => Propel\Runtime\Formatter\ObjectFormatter Object (...)
+         */
+        //$this->assertEquals($coll, $objs, 'rootsOf() filters by ancestors of the same scope');
     }
 
     /**
@@ -325,6 +343,11 @@ public function testFindTree()
         $this->assertEquals([$t8, $t9, $t10], iterator_to_array($tree), 'findTree() retrieves the tree of a scope, ordered by branch');
     }
 
+    /**
+     * @param array $arr
+     *
+     * @return \Propel\Runtime\Collection\ObjectCollection
+     */
     protected function buildCollection($arr)
     {
         $coll = new ObjectCollection();
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorTest.php
index a3f161dc37..3790f95b70 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\NestedSet;
diff --git a/tests/Propel/Tests/Generator/Behavior/NestedSet/TestCase.php b/tests/Propel/Tests/Generator/Behavior/NestedSet/TestCase.php
index b5172a05a1..bdab1286de 100644
--- a/tests/Propel/Tests/Generator/Behavior/NestedSet/TestCase.php
+++ b/tests/Propel/Tests/Generator/Behavior/NestedSet/TestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\NestedSet;
diff --git a/tests/Propel/Tests/Generator/Behavior/ObjectBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/ObjectBehaviorTest.php
index 83af4e8ddd..d3ad22dc8c 100644
--- a/tests/Propel/Tests/Generator/Behavior/ObjectBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/ObjectBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/QueryBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/QueryBehaviorTest.php
index 22376aad9e..84bc5dd28a 100644
--- a/tests/Propel/Tests/Generator/Behavior/QueryBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/QueryBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/QueryCache/QueryCacheTest.php b/tests/Propel/Tests/Generator/Behavior/QueryCache/QueryCacheTest.php
index 8ffcf15866..4d99e77fc2 100644
--- a/tests/Propel/Tests/Generator/Behavior/QueryCache/QueryCacheTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/QueryCache/QueryCacheTest.php
@@ -1,11 +1,9 @@
 <?php
 
-/*
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\QueryCache;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php
index 3f2dcc432e..bd6eec1825 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sluggable;
@@ -104,6 +102,9 @@ public function testObjectCreateRawSlug()
         $this->assertEquals('/foo/hello-world/bar', $t->createRawSlug(), 'createRawSlug() returns a slug based on a pattern');
     }
 
+    /**
+     * @return string[][]
+     */
     public static function cleanupSlugProvider()
     {
         return [
@@ -122,6 +123,9 @@ public static function cleanupSlugProvider()
     /**
      * @dataProvider cleanupSlugProvider
      *
+     * @param string $in
+     * @param string $out
+     *
      * @return void
      */
     public function testObjectCleanupSlugPart($in, $out)
@@ -130,6 +134,9 @@ public function testObjectCleanupSlugPart($in, $out)
         $this->assertEquals($out, $t->cleanupSlugPart($in), 'cleanupSlugPart() cleans up the slug part');
     }
 
+    /**
+     * @return array
+     */
     public static function limitSlugSizeProvider()
     {
         return [
diff --git a/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTestClasses.php b/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTestClasses.php
index 47099589aa..8aacf87bc1 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTestClasses.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTestClasses.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sluggable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php
index b458d67e84..727ee3b93a 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php
index 067db7e6fc..95ec71ef3d 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
@@ -480,7 +478,7 @@ public function testRemoveFromList()
     }
 
     /**
-     * @expectedException Propel\Runtime\Exception\PropelException
+     * @expectedException \Propel\Runtime\Exception\PropelException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php
index 137cd5986e..e260071fd0 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php
index f9725d6e22..b9abce8871 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierTest.php
index a91b12d1c2..714b4603ae 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierWithScopeTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierWithScopeTest.php
index 2d4e6189e2..e4095da6fd 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierWithScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierWithScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorTest.php
index 994f4c26a1..a0b5c9b391 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithEnumScopeTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithEnumScopeTest.php
index f4d1a414fe..ffef3b2126 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithEnumScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithEnumScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithSetScopeTest.php b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithSetScopeTest.php
index 70831615d3..03eccd2f19 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithSetScopeTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithSetScopeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Sortable/TestCase.php b/tests/Propel/Tests/Generator/Behavior/Sortable/TestCase.php
index aff08d39b4..491f4a8361 100644
--- a/tests/Propel/Tests/Generator/Behavior/Sortable/TestCase.php
+++ b/tests/Propel/Tests/Generator/Behavior/Sortable/TestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Sortable;
diff --git a/tests/Propel/Tests/Generator/Behavior/TableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/TableBehaviorTest.php
index 8c257b0e2e..09887bf276 100644
--- a/tests/Propel/Tests/Generator/Behavior/TableBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/TableBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior;
diff --git a/tests/Propel/Tests/Generator/Behavior/Timestampable/TimestampableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Timestampable/TimestampableBehaviorTest.php
index 66bd2471dd..1c3ed7474f 100644
--- a/tests/Propel/Tests/Generator/Behavior/Timestampable/TimestampableBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Timestampable/TimestampableBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Timestampable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Validate/I18nConcreteInheritanceHandleValidateBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Validate/I18nConcreteInheritanceHandleValidateBehaviorTest.php
index 99af4fdabc..0b3d4f1057 100644
--- a/tests/Propel/Tests/Generator/Behavior/Validate/I18nConcreteInheritanceHandleValidateBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Validate/I18nConcreteInheritanceHandleValidateBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Validate;
diff --git a/tests/Propel/Tests/Generator/Behavior/Validate/UniqueConstraintTest.php b/tests/Propel/Tests/Generator/Behavior/Validate/UniqueConstraintTest.php
index 759d0cfd74..c27ded927a 100644
--- a/tests/Propel/Tests/Generator/Behavior/Validate/UniqueConstraintTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Validate/UniqueConstraintTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Validate;
diff --git a/tests/Propel/Tests/Generator/Behavior/Validate/ValidateBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Validate/ValidateBehaviorTest.php
index 29346adadc..42b4cecfeb 100755
--- a/tests/Propel/Tests/Generator/Behavior/Validate/ValidateBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Validate/ValidateBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Validate;
@@ -105,7 +103,7 @@ public function testLoadValidatorMetadataMethodIsStatic()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Please, define your rules for validation.
      *
      * @return void
@@ -125,7 +123,7 @@ public function testParametersNotDefined()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Please, define the column to validate.
      *
      * @return void
@@ -148,7 +146,7 @@ public function testColumnNameNotDefined()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Please, define the validator constraint.
      *
      * @return void
@@ -171,7 +169,7 @@ public function testValidatorNameNotDefined()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\ConstraintNotFoundException
+     * @expectedException \Propel\Generator\Exception\ConstraintNotFoundException
      * @expectedExceptionMessage The constraint class MaximumLength does not exist.
      *
      * @return void
@@ -194,7 +192,7 @@ public function testConstraintNameNotValid()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage The options value, in <parameter> tag must be an array
      *
      * @return void
diff --git a/tests/Propel/Tests/Generator/Behavior/Versionable/TestCase.php b/tests/Propel/Tests/Generator/Behavior/Versionable/TestCase.php
index f22d0d716d..6e1fc09b3e 100644
--- a/tests/Propel/Tests/Generator/Behavior/Versionable/TestCase.php
+++ b/tests/Propel/Tests/Generator/Behavior/Versionable/TestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Versionable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifierTest.php
index 74b17c890e..9f57bfbc34 100644
--- a/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifierTest.php
@@ -1,17 +1,45 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Versionable;
 
 use Propel\Generator\Util\QuickBuilder;
 use Propel\Runtime\Collection\ObjectCollection;
+use VersionableBehaviorTest1;
+use VersionableBehaviorTest10;
+use VersionableBehaviorTest11;
+use VersionableBehaviorTest12;
+use VersionableBehaviorTest1Query;
+use VersionableBehaviorTest1Version;
+use VersionableBehaviorTest1VersionQuery;
+use VersionableBehaviorTest2Query;
+use VersionableBehaviorTest3;
+use VersionableBehaviorTest3Query;
+use VersionableBehaviorTest3VersionQuery;
+use VersionableBehaviorTest4;
+use VersionableBehaviorTest4VersionQuery;
+use VersionableBehaviorTest5;
+use VersionableBehaviorTest6;
+use VersionableBehaviorTest7;
+use VersionableBehaviorTest8Foo;
+use Versionablebehaviortest8Version;
+use VersionableBehaviorTestCustomField;
+use VersionableBehaviorTestCustomFieldKey;
+use VersionableBehaviorTestCustomFieldKeyQuery;
+use VersionableBehaviorTestCustomFieldKeyVersionQuery;
+use VersionableBehaviorTestCustomFieldQuery;
+use VersionableBehaviorTestCustomFieldVersionQuery;
+use VersionableBehaviorTestOneToOne;
+use VersionableBehaviorTestOneToOneKey;
+use VersionableBehaviorTestOneToOneKeyQuery;
+use VersionableBehaviorTestOneToOneKeyVersionQuery;
+use VersionableBehaviorTestOneToOneQuery;
+use VersionableBehaviorTestOneToOneVersionQuery;
 
 /**
  * Tests for VersionableBehavior class
@@ -20,6 +48,9 @@
  */
 class VersionableBehaviorObjectBuilderModifierTest extends TestCase
 {
+    /**
+     * @return void
+     */
     public static function setUpBeforeClass(): void
     {
         $schema = <<<EOF
@@ -115,7 +146,6 @@ public static function setUpBeforeClass(): void
 EOF;
         QuickBuilder::buildSchema($schema3);
 
-
         $schema4 = <<<EOF
 <database name="versionable_behavior_test_4">
     <table name="VersionableBehaviorTest10">
@@ -152,7 +182,7 @@ public static function setUpBeforeClass(): void
     /**
      *  Schema to test relation 1:1 versionable
      */
-    $schema5 = <<<XML
+        $schema5 = <<<XML
 <database name="versionable_behavior_test_one_to_one_database">
     <table name="versionable_behavior_test_one_to_one">
         <column name="id" type="integer" primaryKey="true" autoIncrement="true"/>
@@ -172,7 +202,6 @@ public static function setUpBeforeClass(): void
 XML;
         QuickBuilder::buildSchema($schema5);
 
-
         $schemaCustomName = <<<EOF
 <database name="versionable_behavior_test_custom_field_database">
 
@@ -203,6 +232,9 @@ public static function setUpBeforeClass(): void
         QuickBuilder::buildSchema($schemaCustomName);
     }
 
+    /**
+     * @return void
+     */
     public function testGetVersionExists()
     {
         $this->assertTrue(method_exists('VersionableBehaviorTest1', 'getVersion'));
@@ -210,6 +242,9 @@ public function testGetVersionExists()
         $this->assertTrue(method_exists('VersionableBehaviorTestCustomField', 'getCustomVersion'));
     }
 
+    /**
+     * @return void
+     */
     public function testSetVersionExists()
     {
         $this->assertTrue(method_exists('VersionableBehaviorTest1', 'setVersion'));
@@ -217,6 +252,9 @@ public function testSetVersionExists()
         $this->assertTrue(method_exists('VersionableBehaviorTestCustomField', 'setCustomVersion'));
     }
 
+    /**
+     * @return void
+     */
     public function testMethodsExistsNoChangeNaming()
     {
         $this->assertTrue(method_exists('VersionableBehaviorTest6', 'setFooBar'));
@@ -228,7 +266,6 @@ public function testMethodsExistsNoChangeNaming()
         $this->assertTrue(method_exists('VersionableBehaviorTest7', 'setVersionCreatedAt'));
         $this->assertTrue(method_exists('VersionableBehaviorTest7', 'setVersionCreatedBy'));
         $this->assertTrue(method_exists('VersionableBehaviorTest7', 'setMyComment'));
-
     }
 
     public function providerForNewActiveRecordTests()
@@ -237,45 +274,53 @@ public function providerForNewActiveRecordTests()
             ['\VersionableBehaviorTest1'],
             ['VersionableBehaviorTest2'],
             ['VersionableBehaviorTestCustomField'],
-            ['VersionableBehaviorTestOneToOne']
+            ['VersionableBehaviorTestOneToOne'],
         ];
     }
 
     /**
      * @dataProvider providerForNewActiveRecordTests
+     *
+     * @return void
      */
     public function testVersionGetterAndSetter($class)
     {
-        $o = new $class;
+        $o = new $class();
         $o->setVersion(1234);
         $this->assertEquals(1234, $o->getVersion());
     }
 
     /**
      * @dataProvider providerForNewActiveRecordTests
+     *
+     * @return void
      */
     public function testVersionDefaultValue($class)
     {
-        $o = new $class;
+        $o = new $class();
         $this->assertEquals(0, $o->getVersion());
     }
 
     /**
      * @dataProvider providerForNewActiveRecordTests
+     *
+     * @return void
      */
     public function testVersionValueInitializesOnInsert($class)
     {
-        $o = new $class;
+        $o = new $class();
         $o->save();
         $this->assertEquals(1, $o->getVersion());
     }
 
     /**
      * @dataProvider providerForNewActiveRecordTests
+     *
+     * @return void
      */
     public function testVersionValueIncrementsOnUpdate($class)
     {
-        $o = new $class;
+        $o = new $class();
         $o->save();
         $this->assertEquals(1, $o->getVersion());
         $o->setBar(12);
@@ -289,17 +334,20 @@ public function testVersionValueIncrementsOnUpdate($class)
         $this->assertEquals(4, $o->getVersion());
     }
 
+    /**
+     * @return void
+     */
     public function testVersionValueIncrementsOnDeleteManyToMany()
     {
-        $bar = new \VersionableBehaviorTest10();
+        $bar = new VersionableBehaviorTest10();
         $bar->setBar(42);
         $bar->save();
 
-        $foo = new \VersionableBehaviorTest11();
+        $foo = new VersionableBehaviorTest11();
         $foo->setFoo('Marvin');
         $foo->save();
 
-        $baz = new \VersionableBehaviorTest12();
+        $baz = new VersionableBehaviorTest12();
         $baz->setVersionablebehaviortest11($foo);
         $baz->setBaz('So long and thanks for all the fish');
 
@@ -317,10 +365,12 @@ public function testVersionValueIncrementsOnDeleteManyToMany()
 
     /**
      * @dataProvider providerForNewActiveRecordTests
+     *
+     * @return void
      */
     public function testVersionDoesNotIncrementOnUpdateWithNoChange($class)
     {
-        $o = new $class;
+        $o = new $class();
         $o->setBar(12);
         $o->save();
         $this->assertEquals(1, $o->getVersion());
@@ -331,43 +381,47 @@ public function testVersionDoesNotIncrementOnUpdateWithNoChange($class)
 
     /**
      * @dataProvider providerForNewActiveRecordTests
+     *
+     * @return void
      */
     public function testVersionDoesNotIncrementWhenVersioningIsDisabled($class)
     {
-        $o = new $class;
+        $o = new $class();
 
-        \VersionableBehaviorTest1Query::disableVersioning();
-        \VersionableBehaviorTest2Query::disableVersioning();
-        \VersionableBehaviorTestCustomFieldQuery::disableVersioning();
-        \VersionableBehaviorTestOneToOneQuery::disableVersioning();
+        VersionableBehaviorTest1Query::disableVersioning();
+        VersionableBehaviorTest2Query::disableVersioning();
+        VersionableBehaviorTestCustomFieldQuery::disableVersioning();
+        VersionableBehaviorTestOneToOneQuery::disableVersioning();
         $o->setBar(12);
         $o->save();
         $this->assertEquals(0, $o->getVersion());
         $o->setBar(13);
         $o->save();
         $this->assertEquals(0, $o->getVersion());
-        \VersionableBehaviorTest1Query::enableVersioning();
-        \VersionableBehaviorTest1Query::enableVersioning();
-        \VersionableBehaviorTestCustomFieldQuery::enableVersioning();
-        \VersionableBehaviorTestOneToOneQuery::enableVersioning();
-
+        VersionableBehaviorTest1Query::enableVersioning();
+        VersionableBehaviorTest1Query::enableVersioning();
+        VersionableBehaviorTestCustomFieldQuery::enableVersioning();
+        VersionableBehaviorTestOneToOneQuery::enableVersioning();
     }
 
+    /**
+     * @return void
+     */
     public function testNewVersionCreatesRecordInVersionTable()
     {
-        \VersionableBehaviorTest1Query::create()->deleteAll();
-        \VersionableBehaviorTest1VersionQuery::create()->deleteAll();
-        $o = new \VersionableBehaviorTest1();
+        VersionableBehaviorTest1Query::create()->deleteAll();
+        VersionableBehaviorTest1VersionQuery::create()->deleteAll();
+        $o = new VersionableBehaviorTest1();
         $o->save();
-        $versions = \VersionableBehaviorTest1VersionQuery::create()->find();
+        $versions = VersionableBehaviorTest1VersionQuery::create()->find();
         $this->assertEquals(1, $versions->count());
         $this->assertEquals($o, $versions[0]->getVersionableBehaviorTest1());
         $o->save();
-        $versions = \VersionableBehaviorTest1VersionQuery::create()->find();
+        $versions = VersionableBehaviorTest1VersionQuery::create()->find();
         $this->assertEquals(1, $versions->count());
         $o->setBar(123);
         $o->save();
-        $versions = \VersionableBehaviorTest1VersionQuery::create()->orderByVersion()->find();
+        $versions = VersionableBehaviorTest1VersionQuery::create()->orderByVersion()->find();
         $this->assertEquals(2, $versions->count());
         $this->assertEquals($o->getId(), $versions[0]->getId());
         $this->assertNull($versions[0]->getBar());
@@ -375,21 +429,24 @@ public function testNewVersionCreatesRecordInVersionTable()
         $this->assertEquals(123, $versions[1]->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testNewVersionCreatesRecordInVersionTableWithCustomName()
     {
-        \VersionableBehaviorTest3Query::create()->deleteAll();
-        \VersionableBehaviorTest3VersionQuery::create()->deleteAll();
-        $o = new \VersionableBehaviorTest3();
+        VersionableBehaviorTest3Query::create()->deleteAll();
+        VersionableBehaviorTest3VersionQuery::create()->deleteAll();
+        $o = new VersionableBehaviorTest3();
         $o->save();
-        $versions = \VersionableBehaviorTest3VersionQuery::create()->find();
+        $versions = VersionableBehaviorTest3VersionQuery::create()->find();
         $this->assertEquals(1, $versions->count());
         $this->assertEquals($o, $versions[0]->getVersionableBehaviorTest3());
         $o->save();
-        $versions = \VersionableBehaviorTest3VersionQuery::create()->find();
+        $versions = VersionableBehaviorTest3VersionQuery::create()->find();
         $this->assertEquals(1, $versions->count());
         $o->setBar(123);
         $o->save();
-        $versions = \VersionableBehaviorTest3VersionQuery::create()->orderByVersion()->find();
+        $versions = VersionableBehaviorTest3VersionQuery::create()->orderByVersion()->find();
         $this->assertEquals(2, $versions->count());
         $this->assertEquals($o->getId(), $versions[0]->getId());
         $this->assertNull($versions[0]->getBar());
@@ -397,23 +454,26 @@ public function testNewVersionCreatesRecordInVersionTableWithCustomName()
         $this->assertEquals(123, $versions[1]->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testNewVersionCreatesRecordInVersionTableWithFieldCustomName()
     {
-        \VersionableBehaviorTestCustomFieldQuery::create()->deleteAll();
-        \VersionableBehaviorTestCustomFieldVersionQuery::create()->deleteAll();
-        \VersionableBehaviorTestCustomFieldKeyQuery::create()->deleteAll();
-        \VersionableBehaviorTestCustomFieldKeyVersionQuery::create()->deleteAll();
+        VersionableBehaviorTestCustomFieldQuery::create()->deleteAll();
+        VersionableBehaviorTestCustomFieldVersionQuery::create()->deleteAll();
+        VersionableBehaviorTestCustomFieldKeyQuery::create()->deleteAll();
+        VersionableBehaviorTestCustomFieldKeyVersionQuery::create()->deleteAll();
 
-        $o = new \VersionableBehaviorTestCustomField();
+        $o = new VersionableBehaviorTestCustomField();
         $o->setBar(150);
         $o->save();
 
-        $k = new \VersionableBehaviorTestCustomFieldKey();
+        $k = new VersionableBehaviorTestCustomFieldKey();
         $k->setVersionableBehaviorTestCustomField($o);
         $k->save();
 
-        $versions     = \VersionableBehaviorTestCustomFieldVersionQuery::create()->find();
-        $versionsKeys = \VersionableBehaviorTestCustomFieldKeyVersionQuery::create()->find();
+        $versions = VersionableBehaviorTestCustomFieldVersionQuery::create()->find();
+        $versionsKeys = VersionableBehaviorTestCustomFieldKeyVersionQuery::create()->find();
 
         $this->assertEquals(1, $versions->count());
         $this->assertEquals(1, $versionsKeys->count());
@@ -423,12 +483,12 @@ public function testNewVersionCreatesRecordInVersionTableWithFieldCustomName()
         $o->setBar(150);
         $o->save();
 
-        $versions = \VersionableBehaviorTestCustomFieldVersionQuery::create()->find();
+        $versions = VersionableBehaviorTestCustomFieldVersionQuery::create()->find();
         $this->assertEquals(1, $versions->count());
         $o->setBar(123);
         $o->save();
 
-        $versions = \VersionableBehaviorTestCustomFieldVersionQuery::create()->orderByCustomVersion()->find();
+        $versions = VersionableBehaviorTestCustomFieldVersionQuery::create()->orderByCustomVersion()->find();
 
         $this->assertEquals(2, $versions->count());
         $this->assertEquals($o->getId(), $versions[0]->getId());
@@ -443,51 +503,63 @@ public function testNewVersionCreatesRecordInVersionTableWithFieldCustomName()
         $this->assertEquals($o->getId(), $versions[0]->getId());
     }
 
+    /**
+     * @return void
+     */
     public function testNewVersionDoesNotCreateRecordInVersionTableWhenVersioningIsDisabled()
     {
-        \VersionableBehaviorTest1Query::create()->deleteAll();
-        \VersionableBehaviorTest1VersionQuery::create()->deleteAll();
-        \VersionableBehaviorTest1Query::disableVersioning();
-        $o = new \VersionableBehaviorTest1();
+        VersionableBehaviorTest1Query::create()->deleteAll();
+        VersionableBehaviorTest1VersionQuery::create()->deleteAll();
+        VersionableBehaviorTest1Query::disableVersioning();
+        $o = new VersionableBehaviorTest1();
         $o->save();
-        $versions = \VersionableBehaviorTest1VersionQuery::create()->find();
+        $versions = VersionableBehaviorTest1VersionQuery::create()->find();
         $this->assertEquals(0, $versions->count());
-        \VersionableBehaviorTest1Query::enableVersioning();
+        VersionableBehaviorTest1Query::enableVersioning();
     }
 
+    /**
+     * @return void
+     */
     public function testDeleteObjectDeletesRecordInVersionTable()
     {
-        \VersionableBehaviorTest1Query::create()->deleteAll();
-        \VersionableBehaviorTest1VersionQuery::create()->deleteAll();
-        $o = new \VersionableBehaviorTest1();
+        VersionableBehaviorTest1Query::create()->deleteAll();
+        VersionableBehaviorTest1VersionQuery::create()->deleteAll();
+        $o = new VersionableBehaviorTest1();
         $o->save();
         $o->setBar(123);
         $o->save();
-        $nbVersions = \VersionableBehaviorTest1VersionQuery::create()->count();
+        $nbVersions = VersionableBehaviorTest1VersionQuery::create()->count();
         $this->assertEquals(2, $nbVersions);
         $o->delete();
-        $nbVersions = \VersionableBehaviorTest1VersionQuery::create()->count();
+        $nbVersions = VersionableBehaviorTest1VersionQuery::create()->count();
         $this->assertEquals(0, $nbVersions);
     }
 
+    /**
+     * @return void
+     */
     public function testDeleteObjectDeletesRecordInVersionTableWithCustomName()
     {
-        \VersionableBehaviorTest3Query::create()->deleteAll();
-        \VersionableBehaviorTest3VersionQuery::create()->deleteAll();
-        $o = new \VersionableBehaviorTest3();
+        VersionableBehaviorTest3Query::create()->deleteAll();
+        VersionableBehaviorTest3VersionQuery::create()->deleteAll();
+        $o = new VersionableBehaviorTest3();
         $o->save();
         $o->setBar(123);
         $o->save();
-        $nbVersions = \VersionableBehaviorTest3VersionQuery::create()->count();
+        $nbVersions = VersionableBehaviorTest3VersionQuery::create()->count();
         $this->assertEquals(2, $nbVersions);
         $o->delete();
-        $nbVersions = \VersionableBehaviorTest3VersionQuery::create()->count();
+        $nbVersions = VersionableBehaviorTest3VersionQuery::create()->count();
         $this->assertEquals(0, $nbVersions);
     }
 
+    /**
+     * @return void
+     */
     public function testToVersion()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $o->setBar(123); // version 1
         $o->save();
         $o->setBar(456); // version 2
@@ -498,9 +570,12 @@ public function testToVersion()
         $this->assertEquals(456, $o->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testToVersionAllowsFurtherSave()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $o->setBar(123); // version 1
         $o->save();
         $o->setBar(456); // version 2
@@ -513,20 +588,25 @@ public function testToVersionAllowsFurtherSave()
 
     /**
      * @expectedException \Propel\Runtime\Exception\PropelException
+     *
+     * @return void
      */
     public function testToVersionThrowsExceptionOnIncorrectVersion()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $o->setBar(123); // version 1
         $o->save();
         $o->toVersion(2);
     }
 
+    /**
+     * @return void
+     */
     public function testToVersionPreservesVersionedFkObjects()
     {
-        $a = new \VersionableBehaviorTest4();
+        $a = new VersionableBehaviorTest4();
         $a->setBar(123); // a1
-        $b = new \VersionableBehaviorTest5();
+        $b = new VersionableBehaviorTest5();
         $b->setFoo('Hello');
         $b->setVersionableBehaviorTest4($a);
         $b->save(); //b1
@@ -545,13 +625,16 @@ public function testToVersionPreservesVersionedFkObjects()
         $this->assertEquals($b->getVersionableBehaviorTest4()->getVersion(), 2);
     }
 
+    /**
+     * @return void
+     */
     public function testToVersionPreservesVersionedReferrerObjects()
     {
-        $b1 = new \VersionableBehaviorTest5();
+        $b1 = new VersionableBehaviorTest5();
         $b1->setFoo('Hello');
-        $b2 = new \VersionableBehaviorTest5();
+        $b2 = new VersionableBehaviorTest5();
         $b2->setFoo('World');
-        $a = new \VersionableBehaviorTest4();
+        $a = new VersionableBehaviorTest4();
         $a->setBar(123); // a1
         $a->addVersionableBehaviorTest5($b1);
         $a->addVersionableBehaviorTest5($b2);
@@ -566,7 +649,7 @@ public function testToVersionPreservesVersionedReferrerObjects()
         $bs = $a->getVersionableBehaviorTest5s();
         $this->assertEquals(2, $bs[0]->getVersion());
         $this->assertEquals(1, $bs[1]->getVersion());
-        $b3 = new \VersionableBehaviorTest5();
+        $b3 = new VersionableBehaviorTest5();
         $b3->setFoo('Yep');
         $a->clearVersionableBehaviorTest5s();
         $a->addVersionableBehaviorTest5($b3);
@@ -588,9 +671,12 @@ public function testToVersionPreservesVersionedReferrerObjects()
         $this->assertEquals(2, $a->getVersion());
     }
 
+    /**
+     * @return void
+     */
     public function testGetLastVersionNumber()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $this->assertEquals(0, $o->getLastVersionNumber());
         $o->setBar(123); // version 1
         $o->save();
@@ -603,9 +689,12 @@ public function testGetLastVersionNumber()
         $this->assertEquals(3, $o->getLastVersionNumber());
     }
 
+    /**
+     * @return void
+     */
     public function testIsLastVersion()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $this->assertTrue($o->isLastVersion());
         $o->setBar(123); // version 1
         $o->save();
@@ -619,9 +708,12 @@ public function testIsLastVersion()
         $this->assertTrue($o->isLastVersion());
     }
 
+    /**
+     * @return void
+     */
     public function testIsVersioningNecessary()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $this->assertTrue($o->isVersioningNecessary());
         $o->save();
         $this->assertFalse($o->isVersioningNecessary());
@@ -630,8 +722,8 @@ public function testIsVersioningNecessary()
         $o->save();
         $this->assertFalse($o->isVersioningNecessary());
 
-        \VersionableBehaviorTest1Query::disableVersioning();
-        $o = new \VersionableBehaviorTest1();
+        VersionableBehaviorTest1Query::disableVersioning();
+        $o = new VersionableBehaviorTest1();
         $this->assertFalse($o->isVersioningNecessary());
         $o->save();
         $this->assertFalse($o->isVersioningNecessary());
@@ -639,13 +731,13 @@ public function testIsVersioningNecessary()
         $this->assertFalse($o->isVersioningNecessary());
         $o->save();
         $this->assertFalse($o->isVersioningNecessary());
-        \VersionableBehaviorTest1Query::enableVersioning();
+        VersionableBehaviorTest1Query::enableVersioning();
 
-        $b1 = new \VersionableBehaviorTest5();
+        $b1 = new VersionableBehaviorTest5();
         $b1->setFoo('Hello');
-        $b2 = new \VersionableBehaviorTest5();
+        $b2 = new VersionableBehaviorTest5();
         $b2->setFoo('World');
-        $a = new \VersionableBehaviorTest4();
+        $a = new VersionableBehaviorTest4();
         $a->setBar(123); // a1
         $this->assertTrue($a->isVersioningNecessary());
         $a->save();
@@ -666,11 +758,14 @@ public function testIsVersioningNecessary()
         $this->assertFalse($a->isVersioningNecessary());
     }
 
+    /**
+     * @return void
+     */
     public function testIsVersioningNecessaryWithNullFk()
     {
         // the purpose of this tests is to highlight a bug with FK
         // and isVersioningNecessary()
-        $b1 = new \VersionableBehaviorTest5();
+        $b1 = new VersionableBehaviorTest5();
         $b1->setNew(false);
 
         // this time, the object isn't modified, so the
@@ -681,55 +776,67 @@ public function testIsVersioningNecessaryWithNullFk()
         $this->assertTrue(true, 'getting here means that nothing went wrong');
     }
 
+    /**
+     * @return void
+     */
     public function testAddVersionNewObject()
     {
-        \VersionableBehaviorTest1Query::disableVersioning();
-        \VersionableBehaviorTest1Query::create()->deleteAll();
-        \VersionableBehaviorTest1VersionQuery::create()->deleteAll();
-        $o = new \VersionableBehaviorTest1();
+        VersionableBehaviorTest1Query::disableVersioning();
+        VersionableBehaviorTest1Query::create()->deleteAll();
+        VersionableBehaviorTest1VersionQuery::create()->deleteAll();
+        $o = new VersionableBehaviorTest1();
         $o->addVersion();
         $o->save();
-        $versions = \VersionableBehaviorTest1VersionQuery::create()->find();
+        $versions = VersionableBehaviorTest1VersionQuery::create()->find();
         $this->assertEquals(1, $versions->count());
         $this->assertEquals($o, $versions[0]->getVersionableBehaviorTest1());
-        \VersionableBehaviorTest1Query::enableVersioning();
+        VersionableBehaviorTest1Query::enableVersioning();
     }
 
+    /**
+     * @return void
+     */
     public function testVersionCreatedAt()
     {
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
         $t = time();
         $o->save();
-        $version = \VersionableBehaviorTest4VersionQuery::create()
+        $version = VersionableBehaviorTest4VersionQuery::create()
             ->filterByVersionableBehaviorTest4($o)
             ->findOne();
         $this->assertEquals($t, $version->getVersionCreatedAt('U'));
 
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
         $inThePast = time() - 123456;
         $o->setVersionCreatedAt($inThePast);
         $o->save();
         $this->assertEquals($inThePast, $o->getVersionCreatedAt('U'));
-        $version = \VersionableBehaviorTest4VersionQuery::create()
+        $version = VersionableBehaviorTest4VersionQuery::create()
             ->filterByVersionableBehaviorTest4($o)
             ->findOne();
         $this->assertEquals($o->getVersionCreatedAt(), $version->getVersionCreatedAt());
     }
 
+    /**
+     * @return void
+     */
     public function testVersionCreatedBy()
     {
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
         $o->setVersionCreatedBy('me me me');
         $o->save();
-        $version = \VersionableBehaviorTest4VersionQuery::create()
+        $version = VersionableBehaviorTest4VersionQuery::create()
             ->filterByVersionableBehaviorTest4($o)
             ->findOne();
         $this->assertEquals('me me me', $version->getVersionCreatedBy());
     }
 
+    /**
+     * @return void
+     */
     public function testSaveAndModifyWithNoChangeSchema()
     {
-        $o = new \VersionableBehaviorTest7();
+        $o = new VersionableBehaviorTest7();
         //$o->setVersionCreatedBy('You and I');
         $o->save();
         $this->assertEquals(1, $o->getVersion());
@@ -737,7 +844,7 @@ public function testSaveAndModifyWithNoChangeSchema()
         $o->save();
         $this->assertEquals(2, $o->getVersion());
 
-        $o = new \VersionableBehaviorTest6();
+        $o = new VersionableBehaviorTest6();
         //$o->setVersionCreatedBy('You and I');
         $o->save();
         $this->assertEquals(1, $o->getVersion());
@@ -746,21 +853,27 @@ public function testSaveAndModifyWithNoChangeSchema()
         $this->assertEquals(2, $o->getVersion());
     }
 
+    /**
+     * @return void
+     */
     public function testVersionComment()
     {
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
 
         $o->setVersionComment('Because you deserve it');
         $o->save();
-        $version = \VersionableBehaviorTest4VersionQuery::create()
+        $version = VersionableBehaviorTest4VersionQuery::create()
             ->filterByVersionableBehaviorTest4($o)
             ->findOne();
         $this->assertEquals('Because you deserve it', $version->getVersionComment());
     }
 
+    /**
+     * @return void
+     */
     public function testToVersionWorksWithComments()
     {
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
         $o->setVersionComment('Because you deserve it');
         $o->setBar(123); // version 1
         $o->save();
@@ -773,15 +886,18 @@ public function testToVersionWorksWithComments()
         $this->assertEquals('Unless I change my mind', $o->getVersionComment());
     }
 
+    /**
+     * @return void
+     */
     public function testGetOneVersion()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $o->setBar(123); // version 1
         $o->save();
         $o->setBar(456); // version 2
         $o->save();
         $version = $o->getOneVersion(1);
-        $this->assertTrue($version instanceof \VersionableBehaviorTest1Version);
+        $this->assertTrue($version instanceof VersionableBehaviorTest1Version);
         $this->assertEquals(1, $version->getVersion());
         $this->assertEquals(123, $version->getBar());
         $version = $o->getOneVersion(2);
@@ -789,9 +905,12 @@ public function testGetOneVersion()
         $this->assertEquals(456, $version->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testGetAllVersions()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $versions = $o->getAllVersions();
         $this->assertTrue($versions->isEmpty());
         $o->setBar(123); // version 1
@@ -807,9 +926,12 @@ public function testGetAllVersions()
         $this->assertEquals(456, $versions[1]->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testGetLastVersions()
     {
-        $o = new \VersionableBehaviorTest1();
+        $o = new VersionableBehaviorTest1();
         $versions = $o->getAllVersions();
         $this->assertTrue($versions->isEmpty());
         $o->setBar(123); // version 1
@@ -842,9 +964,12 @@ public function testGetLastVersions()
         $this->assertEquals(789, $versions[1]->getBar());
     }
 
+    /**
+     * @return void
+     */
     public function testCompareVersion()
     {
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
         $versions = $o->getAllVersions();
         $this->assertTrue($versions->isEmpty());
         $o->setBar(123); // version 1
@@ -870,9 +995,12 @@ public function testCompareVersion()
         $this->assertEquals($expected, $diff);
     }
 
+    /**
+     * @return void
+     */
     public function testCompareVersions()
     {
-        $o = new \VersionableBehaviorTest4();
+        $o = new VersionableBehaviorTest4();
         $versions = $o->getAllVersions();
         $this->assertTrue($versions->isEmpty());
         $o->setBar(123); // version 1
@@ -884,22 +1012,25 @@ public function testCompareVersions()
         $o->save();
         $diff = $o->compareVersions(1, 3);
         $expected = [
-            'Bar' => [1 => 123, 3 => 789]
+            'Bar' => [1 => 123, 3 => 789],
         ];
         $this->assertEquals($expected, $diff);
         $diff = $o->compareVersions(1, 3, 'versions');
         $expected = [
             1 => ['Bar' => 123],
-            3 => ['Bar' => 789]
+            3 => ['Bar' => 789],
         ];
         $this->assertEquals($expected, $diff);
     }
 
+    /**
+     * @return void
+     */
     public function testForeignKeyVersion()
     {
-        $a = new \VersionableBehaviorTest4();
+        $a = new VersionableBehaviorTest4();
         $a->setBar(123); // a1
-        $b = new \VersionableBehaviorTest5();
+        $b = new VersionableBehaviorTest5();
         $b->setFoo('Hello');
         $b->setVersionableBehaviorTest4($a);
         $b->save(); //b1
@@ -915,13 +1046,16 @@ public function testForeignKeyVersion()
         $this->assertEquals($b->getVersionableBehaviorTest4()->getVersion(), 2);
     }
 
+    /**
+     * @return void
+     */
     public function testReferrerVersion()
     {
-        $b1 = new \VersionableBehaviorTest5();
+        $b1 = new VersionableBehaviorTest5();
         $b1->setFoo('Hello');
-        $b2 = new \VersionableBehaviorTest5();
+        $b2 = new VersionableBehaviorTest5();
         $b2->setFoo('World');
-        $a = new \VersionableBehaviorTest4();
+        $a = new VersionableBehaviorTest4();
         $a->setBar(123); // a1
         $a->addVersionableBehaviorTest5($b1);
         $a->addVersionableBehaviorTest5($b2);
@@ -932,7 +1066,7 @@ public function testReferrerVersion()
         $a->save();
         $this->assertEquals(2, $a->getVersion());
         $this->assertEquals([2, 1], $a->getOneVersion(2)->getVersionableBehaviorTest5Versions());
-        $b3 = new \VersionableBehaviorTest5();
+        $b3 = new VersionableBehaviorTest5();
         $b3->setFoo('Yep');
         $a->clearVersionableBehaviorTest5s();
         $a->addVersionableBehaviorTest5($b3);
@@ -942,9 +1076,12 @@ public function testReferrerVersion()
         $this->assertEquals([2, 1, 1], $a->getOneVersion(3)->getVersionableBehaviorTest5Versions());
     }
 
+    /**
+     * @return void
+     */
     public function testEnumField()
     {
-        $o = new \VersionableBehaviorTest7();
+        $o = new VersionableBehaviorTest7();
         $o->setStyle('novel');
         $o->save();
 
@@ -961,9 +1098,12 @@ public function testEnumField()
         $this->assertEquals('essay', $o->getOneVersion(2)->getStyle(), 'Second version is an essay');
     }
 
+    /**
+     * @return void
+     */
     public function testSetField()
     {
-        $o = new \VersionableBehaviorTest7();
+        $o = new VersionableBehaviorTest7();
         $o->setStyle2(['novel', 'essay']);
         $o->save();
 
@@ -980,21 +1120,27 @@ public function testSetField()
         $this->assertEquals(['essay'], $o->getOneVersion(2)->getStyle2(), 'Second version is an essay');
     }
 
+    /**
+     * @return void
+     */
     public function testWithInheritance()
     {
-        $b1 = new \VersionableBehaviorTest8Foo();
+        $b1 = new VersionableBehaviorTest8Foo();
         $b1->save();
 
         $b1->setFoobar('name');
         $b1->save();
 
         $object = $b1->getOneVersion($b1->getVersion());
-        $this->assertTrue($object instanceof \Versionablebehaviortest8Version);
+        $this->assertTrue($object instanceof Versionablebehaviortest8Version);
     }
 
+    /**
+     * @return void
+     */
     public function testEnforceVersioning()
     {
-        $bar = new \VersionableBehaviorTest10();
+        $bar = new VersionableBehaviorTest10();
         $bar->setBar(42);
         $bar->save();
 
@@ -1008,26 +1154,29 @@ public function testEnforceVersioning()
         $this->assertEquals(2, $bar->getVersion());
     }
 
+    /**
+     * @return void
+     */
     public function testOneToOneCreatesValidRecord()
     {
-        \VersionableBehaviorTestOneToOneQuery::create()->deleteAll();
-        \VersionableBehaviorTestOneToOneKeyQuery::create()->deleteAll();
-        \VersionableBehaviorTestOneToOneVersionQuery::create()->deleteAll();
-        \VersionableBehaviorTestOneToOneKeyVersionQuery::create()->deleteAll();
+        VersionableBehaviorTestOneToOneQuery::create()->deleteAll();
+        VersionableBehaviorTestOneToOneKeyQuery::create()->deleteAll();
+        VersionableBehaviorTestOneToOneVersionQuery::create()->deleteAll();
+        VersionableBehaviorTestOneToOneKeyVersionQuery::create()->deleteAll();
 
-        $x = new \VersionableBehaviorTestOneToOne();
-        $x->setBar("One To....");
+        $x = new VersionableBehaviorTestOneToOne();
+        $x->setBar('One To....');
         $x->save();
 
-        $y = new \VersionableBehaviorTestOneToOneKey();
+        $y = new VersionableBehaviorTestOneToOneKey();
         $y->setVersionableBehaviorTestOneToOne($x);
-        $y->setBar("One");
+        $y->setBar('One');
         $y->save();
 
         $this->assertEquals(1, $x->getVersion());
         $this->assertEquals(1, $y->getVersion());
 
-        $newX = \VersionableBehaviorTestOneToOneQuery::create()->findOne();
+        $newX = VersionableBehaviorTestOneToOneQuery::create()->findOne();
         $this->assertInstanceOf('VersionableBehaviorTestOneToOne', $x);
         $this->assertInstanceOf('VersionableBehaviorTestOneToOne', $newX);
         $this->assertEquals($x, $newX);
@@ -1048,6 +1197,5 @@ public function testOneToOneCreatesValidRecord()
 
         $this->assertEquals('One To....', $x->getBar());
         $this->assertEquals('One', $x->getVersionableBehaviorTestOneToOneKey()->getBar());//$y
-
     }
 }
diff --git a/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorQueryBuilderModifierTest.php b/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorQueryBuilderModifierTest.php
index e4b11d2ef0..30e5d6e72a 100644
--- a/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorQueryBuilderModifierTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorQueryBuilderModifierTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Versionable;
diff --git a/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorTest.php
index c25fc5ae60..bfb2bdef0c 100644
--- a/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Behavior\Versionable;
diff --git a/tests/Propel/Tests/Generator/Builder/NamespaceTest.php b/tests/Propel/Tests/Generator/Builder/NamespaceTest.php
index c123bd0766..85552cbd9b 100644
--- a/tests/Propel/Tests/Generator/Builder/NamespaceTest.php
+++ b/tests/Propel/Tests/Generator/Builder/NamespaceTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder;
@@ -298,6 +296,12 @@ public function testManyToMany()
             ->joinWith('NamespacedBookListRel')
             ->joinWith('NamespacedBookListRel.NamespacedBookClub')
             ->find($con);
+
+        $array = $books->toArray();
+        $this->assertCount(2, $array);
+
+        $expected = 'Someone1';
+        $this->assertSame($expected, $array[0]['NamespacedBookListRels'][0]['NamespacedBookClub']['GroupLeader']);
     }
 
     /**
diff --git a/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderNamespaceTest.php b/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderNamespaceTest.php
index 95482bc01f..96b5d0c25d 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderNamespaceTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderNamespaceTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
@@ -20,7 +18,6 @@
  * Test class for OMBuilder.
  *
  * @author François Zaninotto
- * @version $Id: OMBuilderBuilderTest.php 1347 2009-12-03 21:06:36Z francois $
  */
 class AbstractOMBuilderNamespaceTest extends TestCase
 {
diff --git a/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderRelatedByTest.php b/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderRelatedByTest.php
index 5cd5beb82a..a759ac75f9 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderRelatedByTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderRelatedByTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
@@ -20,7 +18,6 @@
  * Test class for OMBuilder.
  *
  * @author François Zaninotto
- * @version $Id: OMBuilderBuilderTest.php 1347 2009-12-03 21:06:36Z francois $
  */
 class AbstractOMBuilderRelatedByTest extends TestCase
 {
diff --git a/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderTest.php b/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderTest.php
index f4e01bcd0e..e33482a174 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
@@ -20,7 +18,6 @@
  * Test class for OMBuilder.
  *
  * @author François Zaninotto
- * @version $Id: OMBuilderBuilderTest.php 1347 2009-12-03 21:06:36Z francois $
  */
 class AbstractOMBuilderTest extends TestCase
 {
diff --git a/tests/Propel/Tests/Generator/Builder/Om/Fixtures/ComplexColumnTypeEntityWithConstructor.php b/tests/Propel/Tests/Generator/Builder/Om/Fixtures/ComplexColumnTypeEntityWithConstructor.php
index 54feff9235..5536f9631f 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/Fixtures/ComplexColumnTypeEntityWithConstructor.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/Fixtures/ComplexColumnTypeEntityWithConstructor.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om\Fixtures;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectArrayColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectArrayColumnTypeTest.php
index 706c8da5a7..29c2b57cd6 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectArrayColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectArrayColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectBooleanColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectBooleanColumnTypeTest.php
index 936eb6de40..278196b292 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectBooleanColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectBooleanColumnTypeTest.php
@@ -1,13 +1,14 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Builder\Om;
+
+use ComplexColumnTypeEntity4;
 use Propel\Generator\Util\QuickBuilder;
 use Propel\Tests\TestCase;
 
@@ -50,6 +51,9 @@ public function testIsserName()
         $this->assertTrue(method_exists('ComplexColumnTypeEntity4', 'hasXy'));
     }
 
+    /**
+     * @return array
+     */
     public function providerForSetter()
     {
         return [
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectEnumColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectEnumColumnTypeTest.php
index df2b93c0d7..b5af167644 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectEnumColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectEnumColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectJsonColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectJsonColumnTypeTest.php
index c8c2f8bb2c..165a477701 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectJsonColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectJsonColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLazyLoadTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLazyLoadTest.php
index 18d1a1ff0b..a1e822387f 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLazyLoadTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLazyLoadTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
index c6b6a0fba8..aa99ed6773 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
@@ -1,15 +1,14 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
 
+use Exception;
 use Propel\Tests\Bookstore\BookQuery;
 use Propel\Tests\Bookstore\Map\MediaTableMap;
 use Propel\Tests\Bookstore\Media;
@@ -64,7 +63,7 @@ protected function setUp(): void
      *
      * @param string|null $basename Basename of LOB filename to return (if left blank, will choose random file).
      *
-     * @throws Exception - if specified basename doesn't correspond to a registered LOB filename
+     * @throws \Exception - if specified basename doesn't correspond to a registered LOB filename
      *
      * @return string
      */
@@ -76,9 +75,9 @@ protected function getLobFile($basename = null)
 
         if (isset($this->sampleLobFiles[$basename])) {
             return $this->sampleLobFiles[$basename];
-        } else {
-            throw new Exception("Invalid base LOB filename: $basename");
         }
+
+        throw new Exception("Invalid base LOB filename: $basename");
     }
 
     /**
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationSimpleTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationSimpleTest.php
index 550b1b6764..314caa69e9 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationSimpleTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationSimpleTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Builder\Om;
 
 use Map\Relation1UserTableMap;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKs2Test.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKs2Test.php
index 473200cf92..3799ba1395 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKs2Test.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKs2Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Builder\Om;
 
 use Base\RelationpkUserGroupQuery;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKsTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKsTest.php
index a411a280fa..e162d9fd3f 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKsTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectM2MRelationThreePKsTest.php
@@ -1,12 +1,45 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Builder\Om;
 
-use Propel\Generator\Platform\MysqlPlatform;
-use Propel\Generator\Util\QuickBuilder;
-use Propel\Runtime\Collection\ObjectCollection;
+use Map\Relation2UserTableMap;
 use Propel\Runtime\Collection\ObjectCombinationCollection;
 use Propel\Tests\Helpers\PlatformDatabaseBuildTimeBase;
+use Relation2Group;
+use Relation2GroupQuery;
+use Relation2Position;
+use Relation2PositionQuery;
+use Relation2User;
+use Relation2UserGroupQuery;
+use Relation2UserQuery;
+use Relation3Group;
+use Relation3GroupQuery;
+use Relation3Relation;
+use Relation3RelationQuery;
+use Relation3User;
+use Relation3UserGroupQuery;
+use Relation3UserQuery;
+use Relation4Group;
+use Relation4GroupQuery;
+use Relation4User;
+use Relation4UserGroupQuery;
+use Relation4UserQuery;
+use Relation5Group;
+use Relation5GroupQuery;
+use Relation5User;
+use Relation5UserGroupQuery;
+use Relation5UserQuery;
+use Relation6Group;
+use Relation6GroupQuery;
+use Relation6User;
+use Relation6UserGroupQuery;
+use Relation6UserQuery;
 
 /**
  * Tests for a M2M relation with three pks where each is a FK.
@@ -17,6 +50,9 @@ class GeneratedObjectM2MRelationThreePKsTest extends PlatformDatabaseBuildTimeBa
 {
     protected $databaseName = 'migration';
 
+    /**
+     * @return void
+     */
     public function setUp(): void
     {
         parent::setUp();
@@ -64,36 +100,35 @@ public function setUp(): void
     }
 
     /**
-     *
-     *           add     |    remove     |    set     |    get
+     *           add | remove | set | get
      *        +---------------------------------------------------
-     * add    |    1             2             3            4
-     * remove |    5             6             7            8
-     * set    |    9            10            11           12
-     *
+     * add | 1 2 3 4
+     * remove | 5 6 7 8
+     * set | 9 10 11 12
      */
 
-
-
     /*
      * ####################################
      * 1. add, add
      */
+
+    /**
+     * @return void
+     */
     public function test1()
     {
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
-
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
         $hans->addGroup($admins, $position);
@@ -101,195 +136,209 @@ public function test1()
         $this->assertCount(1, $admins->getUserPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
 
-        $positionLead = new \Relation2Position();
+        $positionLead = new Relation2Position();
         $positionLead->setName('Lead');
         $hans->addGroup($admins, $positionLead);
         $this->assertCount(2, $hans->getGroupPositions());
         $this->assertCount(2, $admins->getUserPositions());
         $hans->save();
 
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
         //try to add the same combination on a new instance
-        \Map\Relation2UserTableMap::clearInstancePool();
-        /** @var $newHansObject \Relation2User */
-        $newHansObject = \Relation2UserQuery::create()->findOneByName('hans');
+        Relation2UserTableMap::clearInstancePool();
+        /** @var \Relation2User $newHansObject */
+        $newHansObject = Relation2UserQuery::create()->findOneByName('hans');
 
         $newHansObject->addGroup($admins, $positionLead);
         $this->assertCount(2, $newHansObject->getGroupPositions());
         $this->assertCount(2, $admins->getUserPositions()); //wrong
         $newHansObject->save();
 
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
     }
 
-
     /*
      * ####################################
      * 2. add, remove
      */
+
+    /**
+     * @return void
+     */
     public function test2()
     {
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
         $hans->addGroup($admins, $position);
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
 
         $hans->removeGroupPosition($admins, $position);
         $this->assertCount(0, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(0, \Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
-
+        $this->assertEquals(0, Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
     }
 
     /*
      * ####################################
      * 3. add, set
      */
+
+    /**
+     * @return void
+     */
     public function test3()
     {
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
         $hans->addGroup($admins, $position);
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
 
         $emptyColl = new ObjectCombinationCollection();
         $hans->setGroupPositions($emptyColl);
         $this->assertCount(0, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(0, \Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(0, Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
     }
 
     /*
      * ####################################
      * 4. and 5. add, get
      */
+
+    /**
+     * @return void
+     */
     public function test4_5()
     {
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
         $hans->addGroup($admins, $position);
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
 
-        \Map\Relation2UserTableMap::clearInstancePool();
-        $newHansObject = \Relation2UserQuery::create()->findOneByName('hans');
+        Relation2UserTableMap::clearInstancePool();
+        $newHansObject = Relation2UserQuery::create()->findOneByName('hans');
         $this->assertCount(1, $newHansObject->getGroupPositions(), 'Makes a extra query and returns the correct one group list');
 
-        \Map\Relation2UserTableMap::clearInstancePool();
-        $newHansObject = \Relation2UserQuery::create()->findOneByName('hans');
+        Relation2UserTableMap::clearInstancePool();
+        $newHansObject = Relation2UserQuery::create()->findOneByName('hans');
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
 
         $newHansObject->addGroup($cleaner, $position2);
         $this->assertCount(2, $newHansObject->getGroupPositions(), 'getGroupPositions makes a query and adds then the added group, thus we have 2');
         $newHansObject->save();
 
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
     }
 
     /*
      * ####################################
      * 6. remove, remove
      */
+
+    /**
+     * @return void
+     */
     public function test6()
     {
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
 
         $hans->addGroup($admins, $position);
@@ -297,97 +346,99 @@ public function test6()
         $this->assertCount(2, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
         $hans->removeGroupPosition($admins, $position);
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
         $hans->removeGroupPosition($cleaner, $position2);
         $this->assertCount(0, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(0, \Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(0, Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
         //add two groupPositions again and made the same removing with a complete new object instance each time
         $hans->addGroup($admins, $position);
         $hans->addGroup($cleaner, $position2);
         $this->assertCount(2, $hans->getGroupPositions());
         $hans->save();
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
-        \Map\Relation2UserTableMap::clearInstancePool();
-        $newHansObject = \Relation2UserQuery::create()->findOneByName('hans');
+        Relation2UserTableMap::clearInstancePool();
+        $newHansObject = Relation2UserQuery::create()->findOneByName('hans');
 
         $newHansObject->removeGroupPosition($admins, $position);
         $this->assertCount(1, $newHansObject->getGroupPositions());
         $newHansObject->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
-        \Map\Relation2UserTableMap::clearInstancePool();
-        $newHansObject = \Relation2UserQuery::create()->findOneByName('hans');
+        Relation2UserTableMap::clearInstancePool();
+        $newHansObject = Relation2UserQuery::create()->findOneByName('hans');
         $newHansObject->removeGroupPosition($cleaner, $position2);
         $this->assertCount(0, $newHansObject->getGroupPositions());
         $newHansObject->save();
 
-        $this->assertEquals(0, \Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(0, Relation2UserGroupQuery::create()->count(), 'We have zero connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
     }
 
     /**
      * 7. remove, set
+     *
+     * @return void
      */
-    public function test7(){
-
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+    public function test7()
+    {
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
         $hans->addGroup($admins, $position);
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
 
         $hans->removeGroupPosition($admins, $position);
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
         $col = new ObjectCombinationCollection();
         $col[] = [$cleaner, $position2];
@@ -396,39 +447,41 @@ public function test7(){
         $this->assertEquals([$cleaner, $position2], $hans->getGroupPositions()->getFirst());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have still one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have still one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
-        $userGroup = \Relation2UserGroupQuery::create()->filterByUser($hans)->findOne();
+        $userGroup = Relation2UserGroupQuery::create()->filterByUser($hans)->findOne();
         $this->assertEquals($position2->getId(), $userGroup->getPositionId());
         $this->assertEquals($cleaner->getId(), $userGroup->getGroupId());
     }
 
     /**
      * 8. remove, get
+     *
+     * @return void
      */
-    public function test8(){
-
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+    public function test8()
+    {
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
 
         $hans->addGroup($admins, $position);
@@ -436,42 +489,44 @@ public function test8(){
         $this->assertCount(2, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have still two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have still two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
         $hans->removeGroupPosition($admins, $position);
         $hans->save();
 
-        \Map\Relation2UserTableMap::clearInstancePool();
-        $newHansObject = \Relation2UserQuery::create()->findOneByName('hans');
+        Relation2UserTableMap::clearInstancePool();
+        $newHansObject = Relation2UserQuery::create()->findOneByName('hans');
         $this->assertCount(1, $newHansObject->getGroupPositions());
     }
 
     /**
      * 9. set, add
+     *
+     * @return void
      */
-    public function test9(){
-
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+    public function test9()
+    {
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
 
         $col = new ObjectCombinationCollection();
@@ -481,35 +536,37 @@ public function test9(){
         $this->assertCount(2, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(2, \Relation2UserGroupQuery::create()->count(), 'We have still two connections.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(2, Relation2UserGroupQuery::create()->count(), 'We have still two connections.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
     }
 
     /**
      * 10. set, remove
+     *
+     * @return void
      */
-    public function test10(){
-
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+    public function test10()
+    {
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
 
         $col = new ObjectCombinationCollection();
@@ -521,29 +578,31 @@ public function test10(){
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
     }
 
     /**
      * 11-12. set, set - set, get
+     *
+     * @return void
      */
-    public function test11_12(){
-
-        \Relation2UserQuery::create()->deleteAll();
-        \Relation2GroupQuery::create()->deleteAll();
-        \Relation2UserGroupQuery::create()->deleteAll();
-        \Relation2PositionQuery::create()->deleteAll();
+    public function test11_12()
+    {
+        Relation2UserQuery::create()->deleteAll();
+        Relation2GroupQuery::create()->deleteAll();
+        Relation2UserGroupQuery::create()->deleteAll();
+        Relation2PositionQuery::create()->deleteAll();
 
-        $hans = new \Relation2User();
+        $hans = new Relation2User();
         $hans->setName('hans');
 
-        $admins = new \Relation2Group();
+        $admins = new Relation2Group();
         $admins->setName('Admins');
 
-        $position = new \Relation2Position();
+        $position = new Relation2Position();
         $position->setName('Trainee');
 
         $col = new ObjectCombinationCollection();
@@ -552,15 +611,15 @@ public function test11_12(){
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation2GroupQuery::create()->count(), 'We have one group.');
-        $this->assertEquals(1, \Relation2PositionQuery::create()->count(), 'We have one position.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation2GroupQuery::create()->count(), 'We have one group.');
+        $this->assertEquals(1, Relation2PositionQuery::create()->count(), 'We have one position.');
 
-        $cleaner = new \Relation2Group();
+        $cleaner = new Relation2Group();
         $cleaner->setName('Cleaner');
 
-        $position2 = new \Relation2Position();
+        $position2 = new Relation2Position();
         $position2->setName('Chef');
 
         $col = new ObjectCombinationCollection();
@@ -569,17 +628,19 @@ public function test11_12(){
         $this->assertCount(1, $hans->getGroupPositions());
         $hans->save();
 
-        $this->assertEquals(1, \Relation2UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation2UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(2, \Relation2GroupQuery::create()->count(), 'We have two groups.');
-        $this->assertEquals(2, \Relation2PositionQuery::create()->count(), 'We have two positions.');
+        $this->assertEquals(1, Relation2UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation2UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(2, Relation2GroupQuery::create()->count(), 'We have two groups.');
+        $this->assertEquals(2, Relation2PositionQuery::create()->count(), 'We have two positions.');
 
-        $userGroup = \Relation2UserGroupQuery::create()->filterByUser($hans)->findOne();
+        $userGroup = Relation2UserGroupQuery::create()->filterByUser($hans)->findOne();
         $this->assertEquals($position2->getId(), $userGroup->getPositionId());
         $this->assertEquals($cleaner->getId(), $userGroup->getGroupId());
     }
 
-
+    /**
+     * @return void
+     */
     public function testRelationThree3()
     {
         $schema = '
@@ -624,19 +685,19 @@ public function testRelationThree3()
 
         $this->buildAndMigrate($schema);
 
-        \Relation3UserGroupQuery::create()->deleteAll();
-        \Relation3UserQuery::create()->deleteAll();
-        \Relation3GroupQuery::create()->deleteAll();
-        \Relation3RelationQuery::create()->deleteAll();
+        Relation3UserGroupQuery::create()->deleteAll();
+        Relation3UserQuery::create()->deleteAll();
+        Relation3GroupQuery::create()->deleteAll();
+        Relation3RelationQuery::create()->deleteAll();
 
-        $hans = new \Relation3User();
+        $hans = new Relation3User();
         $hans->setName('hans');
 
-        $admins = new \Relation3Group();
+        $admins = new Relation3Group();
         $admins->setName('Admins');
         $admins->setId2(1);
 
-        $relation = new \Relation3Relation();
+        $relation = new Relation3Relation();
         $relation->setName('Leader');
 
         $this->assertCount(0, $hans->getGroupRelations(), 'no groups');
@@ -645,22 +706,23 @@ public function testRelationThree3()
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation3UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation3UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation3UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
+        $this->assertEquals(1, Relation3UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation3UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation3UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
 
         $hans->removeGroupRelation($admins, $relation);
         $this->assertCount(0, $hans->getGroupRelations(), 'no groups');
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation3UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(0, \Relation3UserGroupQuery::create()->count(), 'We have zero connection.');
-        $this->assertEquals(0, \Relation3UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
-
+        $this->assertEquals(1, Relation3UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(0, Relation3UserGroupQuery::create()->count(), 'We have zero connection.');
+        $this->assertEquals(0, Relation3UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
     }
 
-
+    /**
+     * @return void
+     */
     public function testRelationThree4()
     {
         $schema = '
@@ -697,14 +759,14 @@ public function testRelationThree4()
 
         $this->buildAndMigrate($schema);
 
-        \Relation4UserGroupQuery::create()->deleteAll();
-        \Relation4UserQuery::create()->deleteAll();
-        \Relation4GroupQuery::create()->deleteAll();
+        Relation4UserGroupQuery::create()->deleteAll();
+        Relation4UserQuery::create()->deleteAll();
+        Relation4GroupQuery::create()->deleteAll();
 
-        $hans = new \Relation4User();
+        $hans = new Relation4User();
         $hans->setName('hans');
 
-        $admins = new \Relation4Group();
+        $admins = new Relation4Group();
         $admins->setName('Admins');
         $admins->setId2(1);
 
@@ -714,20 +776,23 @@ public function testRelationThree4()
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation4UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation4UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation4UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
+        $this->assertEquals(1, Relation4UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation4UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation4UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
 
         $hans->removeGroupRelation($admins, 'teamLeader');
         $this->assertCount(0, $hans->getGroupRelations(), 'no groups');
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation4UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(0, \Relation4UserGroupQuery::create()->count(), 'We have zero connection.');
-        $this->assertEquals(0, \Relation4UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
+        $this->assertEquals(1, Relation4UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(0, Relation4UserGroupQuery::create()->count(), 'We have zero connection.');
+        $this->assertEquals(0, Relation4UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
     }
 
+    /**
+     * @return void
+     */
     public function testRelationThree5()
     {
         $schema = '
@@ -764,14 +829,14 @@ public function testRelationThree5()
 
         $this->buildAndMigrate($schema);
 
-        \Relation5UserGroupQuery::create()->deleteAll();
-        \Relation5UserQuery::create()->deleteAll();
-        \Relation5GroupQuery::create()->deleteAll();
+        Relation5UserGroupQuery::create()->deleteAll();
+        Relation5UserQuery::create()->deleteAll();
+        Relation5GroupQuery::create()->deleteAll();
 
-        $hans = new \Relation5User();
+        $hans = new Relation5User();
         $hans->setName('hans');
 
-        $admins = new \Relation5Group();
+        $admins = new Relation5Group();
         $admins->setName('Admins');
         $admins->setId2(1);
 
@@ -781,20 +846,23 @@ public function testRelationThree5()
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation5UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation5UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation5UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
+        $this->assertEquals(1, Relation5UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation5UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation5UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
 
         $hans->removeGroupRelation($admins, 'teamLeader');
         $this->assertCount(0, $hans->getGroupRelations(), 'no groups');
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation5UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(0, \Relation5UserGroupQuery::create()->count(), 'We have zero connection.');
-        $this->assertEquals(0, \Relation5UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
+        $this->assertEquals(1, Relation5UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(0, Relation5UserGroupQuery::create()->count(), 'We have zero connection.');
+        $this->assertEquals(0, Relation5UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
     }
 
+    /**
+     * @return void
+     */
     public function testRelationThree6()
     {
         $schema = '
@@ -830,14 +898,14 @@ public function testRelationThree6()
 
         $this->buildAndMigrate($schema);
 
-        \Relation6UserGroupQuery::create()->deleteAll();
-        \Relation6UserQuery::create()->deleteAll();
-        \Relation6GroupQuery::create()->deleteAll();
+        Relation6UserGroupQuery::create()->deleteAll();
+        Relation6UserQuery::create()->deleteAll();
+        Relation6GroupQuery::create()->deleteAll();
 
-        $hans = new \Relation6User();
+        $hans = new Relation6User();
         $hans->setName('hans');
 
-        $admins = new \Relation6Group();
+        $admins = new Relation6Group();
         $admins->setName('Admins');
         $admins->setId2(1);
 
@@ -847,18 +915,17 @@ public function testRelationThree6()
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation6UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(1, \Relation6UserGroupQuery::create()->count(), 'We have one connection.');
-        $this->assertEquals(1, \Relation6UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
+        $this->assertEquals(1, Relation6UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(1, Relation6UserGroupQuery::create()->count(), 'We have one connection.');
+        $this->assertEquals(1, Relation6UserQuery::create()->filterByGroup($admins)->count(), 'Hans has one group.');
 
         $hans->removeGroup($admins);
         $this->assertCount(0, $hans->getGroups(), 'no groups');
 
         $hans->save();
 
-        $this->assertEquals(1, \Relation6UserQuery::create()->count(), 'We have one user.');
-        $this->assertEquals(0, \Relation6UserGroupQuery::create()->count(), 'We have zero connection.');
-        $this->assertEquals(0, \Relation6UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
+        $this->assertEquals(1, Relation6UserQuery::create()->count(), 'We have one user.');
+        $this->assertEquals(0, Relation6UserGroupQuery::create()->count(), 'We have zero connection.');
+        $this->assertEquals(0, Relation6UserQuery::create()->filterByGroup($admins)->count(), 'Hans has zero groups.');
     }
-
 }
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectMoreRelationTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectMoreRelationTest.php
index 267556bba9..294fc8f08e 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectMoreRelationTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectMoreRelationTest.php
@@ -1,11 +1,9 @@
 <?php
 
-/*
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license    MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectObjectColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectObjectColumnTypeTest.php
index 26b93c22a1..939b396204 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectObjectColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectObjectColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
index 3376f7b2dc..14a038efee 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectSetColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectSetColumnTypeTest.php
index 06fa972c47..94a6c6e424 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectSetColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectSetColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTemporalColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTemporalColumnTypeTest.php
index 47682e13bd..75e9d9634e 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTemporalColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTemporalColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
index 8045be7e7b..4346ecbfb5 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
@@ -361,7 +359,6 @@ public function testObjectInstances_New()
         $this->assertSame($emp, $retrieved, 'Expected same object (from instance pool)');
     }
 
-    
     /**
      * @return void
      */
@@ -505,7 +502,6 @@ public function testSaveCanInsertNonEmptyObjects()
         $this->assertNotNull($b->getId());
     }
 
-    
     /**
      * @return void
      */
@@ -523,6 +519,7 @@ public function testNoColsModified()
         $super->addSubordinate($e2);
 
         $affected = $super->save();
+        $this->assertSame(3, $affected); // Why 3 and not 0?
     }
 
     /**
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithDateImmutableClassTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithDateImmutableClassTest.php
index 0490174de2..73c1796b78 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithDateImmutableClassTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithDateImmutableClassTest.php
@@ -1,13 +1,16 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Builder\Om;
+
+use DateTime;
+use Foo\SomeTableA;
+use Foo\SomeTableB;
 use Propel\Generator\Config\QuickGeneratorConfig;
 use Propel\Generator\Util\QuickBuilder;
 use Propel\Tests\TestCase;
@@ -62,11 +65,11 @@ public function setUp(): void
      */
     public function testDateTimeInterface()
     {
-        $ModelA = new \Foo\SomeTableA();
+        $ModelA = new SomeTableA();
         $ModelA->setCreatedAt('today');
         $this->assertInstanceOf('\DateTimeInterface', $ModelA->getCreatedAt());
 
-        $ModelB = new \Foo\SomeTableB();
+        $ModelB = new SomeTableB();
         $ModelB->setCreatedAt('today');
         $this->assertInstanceOf('\DateTimeInterface', $ModelB->getCreatedAt());
     }
@@ -76,11 +79,11 @@ public function testDateTimeInterface()
      */
     public function testFieldTypes()
     {
-        $ModelA = new \Foo\SomeTableA();
+        $ModelA = new SomeTableA();
         $ModelA->setCreatedAt('today');
         $this->assertInstanceOf('\DateTimeImmutable', $ModelA->getCreatedAt());
 
-        $ModelB = new \Foo\SomeTableB();
+        $ModelB = new SomeTableB();
         $ModelB->setCreatedAt('today');
         $this->assertInstanceOf('\DateTime', $ModelB->getCreatedAt());
     }
@@ -92,11 +95,11 @@ public function testWithDateTimeToArrayWorks()
     {
         $Date = new DateTime('now');
 
-        $ModelA = new \Foo\SomeTableA();
+        $ModelA = new SomeTableA();
         $ModelA->setCreatedAt(clone $Date);
         $this->assertSame(['Id' => null, 'CreatedAt' => $Date->format('c')], $ModelA->toArray());
 
-        $ModelB = new \Foo\SomeTableB();
+        $ModelB = new SomeTableB();
         $ModelB->setCreatedAt(clone $Date);
         $this->assertSame(['Id' => null, 'CreatedAt' => $Date->format('c')], $ModelB->toArray());
     }
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
index 5ed271bfe9..28caed39a1 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithInterfaceTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithInterfaceTest.php
index 840022640a..a8bbcd6fab 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithInterfaceTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithInterfaceTest.php
@@ -1,13 +1,14 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Builder\Om;
+
+use Foo\MyClassWithInterface;
 use Propel\Generator\Util\QuickBuilder;
 use Propel\Tests\TestCase;
 
@@ -36,6 +37,6 @@ public function setUp(): void
      */
     public function testClassHasInterface()
     {
-          $this->assertInstanceOf('Foo\MyInterface', new \Foo\MyClassWithInterface());
+          $this->assertInstanceOf('Foo\MyInterface', new MyClassWithInterface());
     }
 }
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessQueryBuilderTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessQueryBuilderTest.php
index 012cc365ec..1b18536205 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessQueryBuilderTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessQueryBuilderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessTableMapTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessTableMapTest.php
index c96b134d70..b1584b4314 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessTableMapTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPKLessTableMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php
index 2514bc1ffc..d93212666f 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoDeleteTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoDeleteTest.php
index 729857307d..4bb084db80 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoDeleteTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoDeleteTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoSelectTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoSelectTest.php
index beeaba72f4..d41131a85a 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoSelectTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryDoSelectTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryEnumColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryEnumColumnTypeTest.php
index e7c50d9cb2..6818caa018 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryEnumColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryEnumColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryObjectColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryObjectColumnTypeTest.php
index eccecc39dc..2c9c723215 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryObjectColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryObjectColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQuerySetColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQuerySetColumnTypeTest.php
index 7821562843..51652c1e85 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedQuerySetColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedQuerySetColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapEnumColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapEnumColumnTypeTest.php
index 5e31652578..188090dea9 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapEnumColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapEnumColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapLazyLoadTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapLazyLoadTest.php
index 188d5f456d..00f0f0bcb7 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapLazyLoadTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapLazyLoadTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapSetColumnTypeTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapSetColumnTypeTest.php
index bf305d2e6d..75e1dc8674 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapSetColumnTypeTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapSetColumnTypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapTest.php
index 928f790cc2..23b1e2dafd 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedTableMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/ObjectBuilderTest.php b/tests/Propel/Tests/Generator/Builder/Om/ObjectBuilderTest.php
index aef27c2450..2b6e1fb1a0 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/ObjectBuilderTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/ObjectBuilderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/PoisonedCacheBugTest.php b/tests/Propel/Tests/Generator/Builder/Om/PoisonedCacheBugTest.php
index 83e32f237a..4c8a9e57f7 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/PoisonedCacheBugTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/PoisonedCacheBugTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license    MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderInheritanceTest.php b/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderInheritanceTest.php
index 70af17f9f8..15d9090c8d 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderInheritanceTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderInheritanceTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTest.php b/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTest.php
index 44e11c651e..112fa38235 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
@@ -99,13 +97,13 @@ public function testCreate()
     public function testCreateCustom()
     {
         // see the myBookQuery class definition at the end of this file
-        $query = myCustomBookQuery::create();
-        $this->assertTrue($query instanceof myCustomBookQuery, 'create() returns an object of its class');
+        $query = MyCustomBookQuery::create();
+        $this->assertTrue($query instanceof MyCustomBookQuery, 'create() returns an object of its class');
         $this->assertTrue($query instanceof BookQuery, 'create() returns an object of its class');
         $this->assertEquals('bookstore', $query->getDbName(), 'create() sets dabatase name');
         $this->assertEquals('Propel\Tests\Bookstore\Book', $query->getModelName(), 'create() sets model name');
-        $query = myCustomBookQuery::create('foo');
-        $this->assertTrue($query instanceof myCustomBookQuery, 'create() returns an object of its class');
+        $query = MyCustomBookQuery::create('foo');
+        $this->assertTrue($query instanceof MyCustomBookQuery, 'create() returns an object of its class');
         $this->assertEquals('bookstore', $query->getDbName(), 'create() sets dabatase name');
         $this->assertEquals('Propel\Tests\Bookstore\Book', $query->getModelName(), 'create() sets model name');
         $this->assertEquals('foo', $query->getModelAlias(), 'create() can set the model alias');
@@ -339,7 +337,7 @@ public function testFindPkComplexAddsObjectToInstancePool()
      */
     public function testFindPkCallsPreSelect()
     {
-        $q = new mySecondBookQuery();
+        $q = new MySecondBookQuery();
         $this->assertFalse($q::$preSelectWasCalled);
         $q->findPk(123);
         $this->assertTrue($q::$preSelectWasCalled);
diff --git a/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTestClasses.php b/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTestClasses.php
index 3ebafe075a..ef107af244 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTestClasses.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTestClasses.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
@@ -14,14 +12,14 @@
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Tests\Bookstore\BookQuery;
 
-class myCustomBookQuery extends BookQuery
+class MyCustomBookQuery extends BookQuery
 {
     public static function create($modelAlias = null, ?Criteria $criteria = null)
     {
-        if ($criteria instanceof myCustomBookQuery) {
+        if ($criteria instanceof MyCustomBookQuery) {
             return $criteria;
         }
-        $query = new myCustomBookQuery();
+        $query = new MyCustomBookQuery();
         if (null !== $modelAlias) {
             $query->setModelAlias($modelAlias);
         }
@@ -33,7 +31,7 @@ public static function create($modelAlias = null, ?Criteria $criteria = null)
     }
 }
 
-class mySecondBookQuery extends BookQuery
+class MySecondBookQuery extends BookQuery
 {
     public static $preSelectWasCalled = false;
 
diff --git a/tests/Propel/Tests/Generator/Builder/Om/TableMapBuilderTest.php b/tests/Propel/Tests/Generator/Builder/Om/TableMapBuilderTest.php
index a3c06b5d85..22d1f8c492 100644
--- a/tests/Propel/Tests/Generator/Builder/Om/TableMapBuilderTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Om/TableMapBuilderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Om;
diff --git a/tests/Propel/Tests/Generator/Builder/Util/PropelTemplateTest.php b/tests/Propel/Tests/Generator/Builder/Util/PropelTemplateTest.php
index d5d8f3f53b..48b8e3b9f1 100644
--- a/tests/Propel/Tests/Generator/Builder/Util/PropelTemplateTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Util/PropelTemplateTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Util;
diff --git a/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderJoinSchemaTest.php b/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderJoinSchemaTest.php
index ab87b8255e..f78e35b46e 100644
--- a/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderJoinSchemaTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderJoinSchemaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Util;
diff --git a/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderTest.php b/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderTest.php
index 87d664ec3f..f0fe544271 100644
--- a/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderTest.php
+++ b/tests/Propel/Tests/Generator/Builder/Util/SchemaReaderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Builder\Util;
diff --git a/tests/Propel/Tests/Generator/Command/AbstractCommandTest.php b/tests/Propel/Tests/Generator/Command/AbstractCommandTest.php
index 9ece2e5445..7f238cef2e 100644
--- a/tests/Propel/Tests/Generator/Command/AbstractCommandTest.php
+++ b/tests/Propel/Tests/Generator/Command/AbstractCommandTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Command;
diff --git a/tests/Propel/Tests/Generator/Command/DatabaseReverseTest.php b/tests/Propel/Tests/Generator/Command/DatabaseReverseTest.php
index 72c520da7d..d6f0b6d26a 100644
--- a/tests/Propel/Tests/Generator/Command/DatabaseReverseTest.php
+++ b/tests/Propel/Tests/Generator/Command/DatabaseReverseTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Command;
 
 use Propel\Generator\Command\AbstractCommand;
diff --git a/tests/Propel/Tests/Generator/Command/GraphvizGenerateTest.php b/tests/Propel/Tests/Generator/Command/GraphvizGenerateTest.php
index b0f4451005..6fabc5daa4 100644
--- a/tests/Propel/Tests/Generator/Command/GraphvizGenerateTest.php
+++ b/tests/Propel/Tests/Generator/Command/GraphvizGenerateTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Command;
 
 use Propel\Generator\Command\GraphvizGenerateCommand;
diff --git a/tests/Propel/Tests/Generator/Command/InitCommandTest.php b/tests/Propel/Tests/Generator/Command/InitCommandTest.php
index 2a6854f1a2..eeeb60a70c 100644
--- a/tests/Propel/Tests/Generator/Command/InitCommandTest.php
+++ b/tests/Propel/Tests/Generator/Command/InitCommandTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Command;
@@ -112,6 +110,11 @@ public function testExecuteAborted()
         $this->assertContains('Process aborted', $commandTester->getDisplay());
     }
 
+    /**
+     * @param string $lastAnswer
+     *
+     * @return array
+     */
     private function getInputsArray($lastAnswer = 'yes')
     {
         $dsn = $this->getConnectionDsn('bookstore', true);
diff --git a/tests/Propel/Tests/Generator/Command/MigrationTest.php b/tests/Propel/Tests/Generator/Command/MigrationTest.php
index 7cd3f1fb04..9c810530b9 100644
--- a/tests/Propel/Tests/Generator/Command/MigrationTest.php
+++ b/tests/Propel/Tests/Generator/Command/MigrationTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Command;
 
 use Propel\Generator\Command\MigrationCreateCommand;
diff --git a/tests/Propel/Tests/Generator/Config/ArrayToPhpConverterTest.php b/tests/Propel/Tests/Generator/Config/ArrayToPhpConverterTest.php
index 032424cd9d..e5e9fd9dbe 100644
--- a/tests/Propel/Tests/Generator/Config/ArrayToPhpConverterTest.php
+++ b/tests/Propel/Tests/Generator/Config/ArrayToPhpConverterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Config;
diff --git a/tests/Propel/Tests/Generator/Config/GeneratorConfigTest.php b/tests/Propel/Tests/Generator/Config/GeneratorConfigTest.php
index 49837cfdfd..fa87628135 100644
--- a/tests/Propel/Tests/Generator/Config/GeneratorConfigTest.php
+++ b/tests/Propel/Tests/Generator/Config/GeneratorConfigTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Config;
@@ -116,7 +114,7 @@ public function testGetConfiguredPlatform()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Invalid database name: no configured connection named `badsource`.
      *
      * @return void
@@ -171,7 +169,7 @@ public function testGetConfiguredSchemaParserGivenClass()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\BuildException
+     * @expectedException \Propel\Generator\Exception\BuildException
      * @expectedExceptionMessage Specified class (\Propel\Generator\Platform\MysqlPlatform) does not implement \Propel\Generator\Reverse\SchemaParserInterface interface.
      *
      * @return void
@@ -192,7 +190,7 @@ public function testGetConfiguredSchemaParserGivenNonSchemaParserClass()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\ClassNotFoundException
+     * @expectedException \Propel\Generator\Exception\ClassNotFoundException
      * @expectedExceptionMessage Reverse SchemaParser class for `\Propel\Generator\Reverse\BadSchemaParser` not found.
      *
      * @return void
@@ -224,7 +222,7 @@ public function testGetConfiguredBuilder()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\ClassNotFoundException
+     * @expectedException \Propel\Generator\Exception\ClassNotFoundException
      *
      * @return void
      */
@@ -250,7 +248,7 @@ public function testGetConfiguredPluralizer()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\ClassNotFoundException
+     * @expectedException \Propel\Generator\Exception\ClassNotFoundException
      * @expectedExceptionMessage Class \Propel\Common\Pluralizer\WrongEnglishPluralizer not found.
      *
      * @return void
@@ -264,7 +262,7 @@ public function testGetConfiguredPluralizerNonExistentClassThrowsException()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\BuildException
+     * @expectedException \Propel\Generator\Exception\BuildException
      * @expectedExceptionMessage Specified class (\Propel\Common\Config\PropelConfiguration) does not implement
      *
      * @return void
@@ -357,7 +355,7 @@ public function testGetBuildConnectionGivenDatabase()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Invalid database name: no configured connection named `wrongsource`.
      *
      * @return void
@@ -388,7 +386,7 @@ public function testGetConnection()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Invalid database name: no configured connection named `badsource`.
      *
      * @return void
diff --git a/tests/Propel/Tests/Generator/Config/QuickGeneratorConfigTest.php b/tests/Propel/Tests/Generator/Config/QuickGeneratorConfigTest.php
index 172e18231b..75df11501c 100644
--- a/tests/Propel/Tests/Generator/Config/QuickGeneratorConfigTest.php
+++ b/tests/Propel/Tests/Generator/Config/QuickGeneratorConfigTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Config;
@@ -37,7 +35,7 @@ public function testGetConfiguredBuilder()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\InvalidArgumentException
+     * @expectedException \Propel\Generator\Exception\InvalidArgumentException
      * @expectedExceptionMessage Invalid data model builder type `bad_type`
      *
      * @return void
diff --git a/tests/Propel/Tests/Generator/Manager/MigrationManagerTest.php b/tests/Propel/Tests/Generator/Manager/MigrationManagerTest.php
index dbb2cb029c..d2d24546a1 100644
--- a/tests/Propel/Tests/Generator/Manager/MigrationManagerTest.php
+++ b/tests/Propel/Tests/Generator/Manager/MigrationManagerTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Manager;
 
 use Propel\Generator\Config\GeneratorConfig;
diff --git a/tests/Propel/Tests/Generator/Migration/BaseTest.php b/tests/Propel/Tests/Generator/Migration/BaseTest.php
index 002e2a4c8e..79c22f9d13 100644
--- a/tests/Propel/Tests/Generator/Migration/BaseTest.php
+++ b/tests/Propel/Tests/Generator/Migration/BaseTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Migration;
 
 /**
diff --git a/tests/Propel/Tests/Generator/Migration/ForeignKeyTest.php b/tests/Propel/Tests/Generator/Migration/ForeignKeyTest.php
index 8b15fdc1bd..e5f0ad2f16 100644
--- a/tests/Propel/Tests/Generator/Migration/ForeignKeyTest.php
+++ b/tests/Propel/Tests/Generator/Migration/ForeignKeyTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Migration;
 
 /**
diff --git a/tests/Propel/Tests/Generator/Migration/IndexTest.php b/tests/Propel/Tests/Generator/Migration/IndexTest.php
index 5fe2282537..2cbb05bd20 100644
--- a/tests/Propel/Tests/Generator/Migration/IndexTest.php
+++ b/tests/Propel/Tests/Generator/Migration/IndexTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Migration;
 
 /**
diff --git a/tests/Propel/Tests/Generator/Migration/MigrationTestCase.php b/tests/Propel/Tests/Generator/Migration/MigrationTestCase.php
index 596bca86dd..98dfa2b7a1 100644
--- a/tests/Propel/Tests/Generator/Migration/MigrationTestCase.php
+++ b/tests/Propel/Tests/Generator/Migration/MigrationTestCase.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Migration;
 
 use Exception;
@@ -64,6 +70,7 @@ public function setUp(): void
 
     /**
      * @param string $xml
+     * @param bool $changeRequired
      *
      * @throws \Propel\Generator\Exception\BuildException
      *
diff --git a/tests/Propel/Tests/Generator/Migration/PrimaryKeyAITest.php b/tests/Propel/Tests/Generator/Migration/PrimaryKeyAITest.php
index e6d69dc023..ea6b46049a 100644
--- a/tests/Propel/Tests/Generator/Migration/PrimaryKeyAITest.php
+++ b/tests/Propel/Tests/Generator/Migration/PrimaryKeyAITest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Migration;
 
 /**
diff --git a/tests/Propel/Tests/Generator/Migration/PrimaryKeyTest.php b/tests/Propel/Tests/Generator/Migration/PrimaryKeyTest.php
index e283b628f8..02ee05f10c 100644
--- a/tests/Propel/Tests/Generator/Migration/PrimaryKeyTest.php
+++ b/tests/Propel/Tests/Generator/Migration/PrimaryKeyTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Migration;
 
 /**
diff --git a/tests/Propel/Tests/Generator/Model/BehaviorTest.php b/tests/Propel/Tests/Generator/Model/BehaviorTest.php
index eec00e6be5..273c5ad4d1 100644
--- a/tests/Propel/Tests/Generator/Model/BehaviorTest.php
+++ b/tests/Propel/Tests/Generator/Model/BehaviorTest.php
@@ -1,16 +1,17 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model;
+
 use Propel\Generator\Builder\Util\SchemaReader;
 use Propel\Generator\Model\Behavior;
 use Propel\Generator\Model\Table;
+use Propel\Tests\Helpers\MultipleBehavior;
 use Propel\Tests\TestCase;
 
 /**
@@ -20,10 +21,6 @@
  */
 class BehaviorTest extends TestCase
 {
-    private $schemaReader;
-
-    private $appData;
-
     /**
      * @return void
      */
@@ -39,7 +36,7 @@ public function testSetupObject()
      */
     public function testSetupObjectWithMultipleBehaviorWithNoId()
     {
-        $b = new Propel\Tests\Helpers\MultipleBehavior();
+        $b = new MultipleBehavior();
         $b->loadMapping(['name' => 'foo']);
 
         $this->assertEquals($b->getName(), 'foo', 'setupObject() sets the Behavior name from XML attributes');
@@ -51,7 +48,7 @@ public function testSetupObjectWithMultipleBehaviorWithNoId()
      */
     public function testSetupObjectWithMultipleBehaviorWithId()
     {
-        $b = new Propel\Tests\Helpers\MultipleBehavior();
+        $b = new MultipleBehavior();
         $b->loadMapping(['name' => 'foo', 'id' => 'bar']);
 
         $this->assertEquals($b->getName(), 'foo', 'setupObject() sets the Behavior name from XML attributes');
@@ -59,7 +56,7 @@ public function testSetupObjectWithMultipleBehaviorWithId()
     }
 
     /**
-     * @expectedException Propel\Generator\Exception\LogicException
+     * @expectedException \Propel\Generator\Exception\LogicException
      *
      * @return void
      */
@@ -162,7 +159,7 @@ public function testUnknownBehavior()
   </table>
 </database>
 EOF;
-        $appData = $schemaReader->parseString($schema);
+        $schemaReader->parseString($schema);
     }
 
     /**
diff --git a/tests/Propel/Tests/Generator/Model/ColumnDefaultValueTest.php b/tests/Propel/Tests/Generator/Model/ColumnDefaultValueTest.php
index 0d1e58efae..3c9247a589 100644
--- a/tests/Propel/Tests/Generator/Model/ColumnDefaultValueTest.php
+++ b/tests/Propel/Tests/Generator/Model/ColumnDefaultValueTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model;
+
 use Propel\Generator\Model\ColumnDefaultValue;
 use Propel\Tests\TestCase;
 
diff --git a/tests/Propel/Tests/Generator/Model/ColumnTest.php b/tests/Propel/Tests/Generator/Model/ColumnTest.php
index 51945bf730..2617b4d5c6 100644
--- a/tests/Propel/Tests/Generator/Model/ColumnTest.php
+++ b/tests/Propel/Tests/Generator/Model/ColumnTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/ConstantNameTest.php b/tests/Propel/Tests/Generator/Model/ConstantNameTest.php
index 17005023bc..bcde53ae40 100644
--- a/tests/Propel/Tests/Generator/Model/ConstantNameTest.php
+++ b/tests/Propel/Tests/Generator/Model/ConstantNameTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
@@ -99,6 +97,8 @@ public function testSingleInheritanceKeyStringWithSpecialChars()
     }
 
     /**
+     * @param string $schema
+     *
      * @return void
      */
     protected function buildClasses($schema)
diff --git a/tests/Propel/Tests/Generator/Model/DatabaseTest.php b/tests/Propel/Tests/Generator/Model/DatabaseTest.php
index ca018f396d..c08a487850 100644
--- a/tests/Propel/Tests/Generator/Model/DatabaseTest.php
+++ b/tests/Propel/Tests/Generator/Model/DatabaseTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/ColumnComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/ColumnComparatorTest.php
index ab9d2da816..8ff03afae2 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/ColumnComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/ColumnComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\ColumnDefaultValue;
 use Propel\Generator\Model\Diff\ColumnComparator;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/DatabaseTableComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/DatabaseTableComparatorTest.php
index 7cbfb6c29a..92357e77fa 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/DatabaseTableComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/DatabaseTableComparatorTest.php
@@ -1,14 +1,12 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license    MIT License
  */
 
-namespace Propel\Tests\Generator\Model\Diff\DatabaseTableComparatorTest;
+namespace Propel\Tests\Generator\Model\Diff;
 
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\ColumnDefaultValue;
@@ -23,7 +21,7 @@
 /**
  * Tests for the Table method of the DatabaseComparator service class.
  */
-class PropelDatabaseTableComparatorTest extends TestCase
+class DatabaseTableComparatorTest extends TestCase
 {
     /**
      * @return void
diff --git a/tests/Propel/Tests/Generator/Model/Diff/ForeignKeyComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/ForeignKeyComparatorTest.php
index ca78034aea..63814d77a4 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/ForeignKeyComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/ForeignKeyComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\Diff\ForeignKeyComparator;
 use Propel\Generator\Model\ForeignKey;
@@ -18,7 +17,7 @@
 /**
  * Tests for the ColumnComparator service class.
  */
-class PropelForeignComparatorTest extends TestCase
+class ForeignKeyComparatorTest extends TestCase
 {
     /**
      * @return void
diff --git a/tests/Propel/Tests/Generator/Model/Diff/IndexComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/IndexComparatorTest.php
index f7dd35f225..a5854fc62f 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/IndexComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/IndexComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\Diff\IndexComparator;
 use Propel\Generator\Model\Index;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/PropelTableColumnComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/PropelTableColumnComparatorTest.php
index 6f67e9bb5a..c5badad9fa 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/PropelTableColumnComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/PropelTableColumnComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\ColumnDefaultValue;
 use Propel\Generator\Model\Diff\ColumnComparator;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/PropelTableForeignKeyComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/PropelTableForeignKeyComparatorTest.php
index 9bcf3539d0..0bc26cb525 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/PropelTableForeignKeyComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/PropelTableForeignKeyComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\Database;
 use Propel\Generator\Model\Diff\TableComparator;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/PropelTableIndexComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/PropelTableIndexComparatorTest.php
index 7a334aaeec..e8d21349ec 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/PropelTableIndexComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/PropelTableIndexComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\ColumnDefaultValue;
 use Propel\Generator\Model\Diff\TableComparator;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/PropelTablePkColumnComparatorTest.php b/tests/Propel/Tests/Generator/Model/Diff/PropelTablePkColumnComparatorTest.php
index 609868be47..23ff9954c0 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/PropelTablePkColumnComparatorTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/PropelTablePkColumnComparatorTest.php
@@ -1,14 +1,13 @@
 <?php
 
-/*
- *	$Id: TableTest.php 1891 2010-08-09 15:03:18Z francois $
- * This file is part of the Propel package.
+/**
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model\Diff;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\ColumnDefaultValue;
 use Propel\Generator\Model\Diff\TableComparator;
diff --git a/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php b/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php
index dffaab2504..b27ec8a77e 100644
--- a/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php
+++ b/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Model\Diff;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Propel/Tests/Generator/Model/DomainTest.php b/tests/Propel/Tests/Generator/Model/DomainTest.php
index 1663867f00..449d88a774 100644
--- a/tests/Propel/Tests/Generator/Model/DomainTest.php
+++ b/tests/Propel/Tests/Generator/Model/DomainTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/ForeignKeyTest.php b/tests/Propel/Tests/Generator/Model/ForeignKeyTest.php
index f33b4117bf..89f3cdabd7 100644
--- a/tests/Propel/Tests/Generator/Model/ForeignKeyTest.php
+++ b/tests/Propel/Tests/Generator/Model/ForeignKeyTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/IndexTest.php b/tests/Propel/Tests/Generator/Model/IndexTest.php
index 3862ffc83a..d32b71278a 100644
--- a/tests/Propel/Tests/Generator/Model/IndexTest.php
+++ b/tests/Propel/Tests/Generator/Model/IndexTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/InheritanceTest.php b/tests/Propel/Tests/Generator/Model/InheritanceTest.php
index 71ccbe2394..1cfde4d75d 100644
--- a/tests/Propel/Tests/Generator/Model/InheritanceTest.php
+++ b/tests/Propel/Tests/Generator/Model/InheritanceTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/MappingModelTest.php b/tests/Propel/Tests/Generator/Model/MappingModelTest.php
index 811ba68338..5879b1383f 100644
--- a/tests/Propel/Tests/Generator/Model/MappingModelTest.php
+++ b/tests/Propel/Tests/Generator/Model/MappingModelTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license    MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/ModelTestCase.php b/tests/Propel/Tests/Generator/Model/ModelTestCase.php
index 14e3f1c4f6..166352b7aa 100644
--- a/tests/Propel/Tests/Generator/Model/ModelTestCase.php
+++ b/tests/Propel/Tests/Generator/Model/ModelTestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
@@ -25,7 +23,7 @@ abstract class ModelTestCase extends TestCase
      * @param string $name The behavior name
      * @param array $options An array of options
      *
-     * @return Behavior
+     * @return \Propel\Generator\Model\Behavior
      */
     protected function getBehaviorMock($name, array $options = [])
     {
@@ -85,7 +83,7 @@ protected function getBehaviorMock($name, array $options = [])
      * @param string|null $name The foreign key name
      * @param array $options An array of options
      *
-     * @return ForeignKey
+     * @return \Propel\Generator\Model\ForeignKey
      */
     protected function getForeignKeyMock($name = null, array $options = [])
     {
@@ -168,7 +166,7 @@ protected function getIndexMock($name = null, array $options = [])
      * @param string|null $name The unique index name
      * @param array $options An array of options
      *
-     * @return Unique
+     * @return \Propel\Generator\Model\Unique
      */
     protected function getUniqueIndexMock($name = null, array $options = [])
     {
@@ -193,7 +191,7 @@ protected function getUniqueIndexMock($name = null, array $options = [])
      * @param string|null $name The schema name
      * @param array $options An array of options
      *
-     * @return Schema
+     * @return \Propel\Generator\Model\Schema
      */
     protected function getSchemaMock($name = null, array $options = [])
     {
@@ -226,7 +224,7 @@ protected function getSchemaMock($name = null, array $options = [])
      * @param array $options An array of options
      * @param string $schemaDelimiter
      *
-     * @return PlatformInterface
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatformMock($supportsSchemas = true, array $options = [], $schemaDelimiter = '.')
     {
@@ -265,7 +263,7 @@ protected function getPlatformMock($supportsSchemas = true, array $options = [],
      * @param string|null $name
      * @param array $options An array of options
      *
-     * @return Domain
+     * @return \Propel\Generator\Model\Domain
      */
     protected function getDomainMock($name = null, array $options = [])
     {
@@ -292,7 +290,7 @@ protected function getDomainMock($name = null, array $options = [])
      * @param string $name The table name
      * @param array $options An array of options
      *
-     * @return Table
+     * @return \Propel\Generator\Model\Table
      */
     protected function getTableMock($name, array $options = [])
     {
@@ -368,7 +366,7 @@ protected function getTableMock($name, array $options = [])
      * @param string $name The database name
      * @param array $options An array of options
      *
-     * @return Database
+     * @return \Propel\Generator\Model\Database
      */
     protected function getDatabaseMock($name, array $options = [])
     {
@@ -400,7 +398,7 @@ protected function getDatabaseMock($name, array $options = [])
      * @param string $name The column name
      * @param array $options An array of options
      *
-     * @return Column
+     * @return \Propel\Generator\Model\Column
      */
     protected function getColumnMock($name, array $options = [])
     {
diff --git a/tests/Propel/Tests/Generator/Model/NameFactoryTest.php b/tests/Propel/Tests/Generator/Model/NameFactoryTest.php
index 978b6e35db..102d23b6a2 100644
--- a/tests/Propel/Tests/Generator/Model/NameFactoryTest.php
+++ b/tests/Propel/Tests/Generator/Model/NameFactoryTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
@@ -68,7 +66,7 @@ class NameFactoryTest extends BaseTestCase
      *
      * @param int $len the number of characters to include in the string
      *
-     * @return a string of length <code>len</code> with every character an 'A'
+     * @return string A string of length <code>len</code> with every character an 'A'
      */
     private static function makeString($len)
     {
@@ -80,7 +78,6 @@ private static function makeString($len)
         return $buf;
     }
 
-    
     /**
      * @return void
      */
@@ -116,7 +113,6 @@ public function setUp(): void
         $schema->addDatabase($this->database);
     }
 
-    
     /**
      * @return void
      */
@@ -140,16 +136,16 @@ public function testNames()
      * Creates the list of arguments to pass to the specified type of
      * <code>NameGeneratorInterface</code> implementation.
      *
-     * @param algo The class name of the <code>NameGeneratorInterface</code> to
+     * @param string $algo The class name of the <code>NameGeneratorInterface</code> to
      * create an argument list for.
-     * @param inputs The (possibly partial) list inputs from which to
+     * @param array $inputs The (possibly partial) list inputs from which to
      * generate the final list.
      *
-     * @return the list of arguments to pass to the <code>NameGeneratorInterface</code>
+     * @return array The list of arguments to pass to the <code>NameGeneratorInterface</code>
      */
-    private function makeInputs($algo, $inputs)
+    private function makeInputs($algo, array $inputs)
     {
-        if (NameFactory::CONSTRAINT_GENERATOR == $algo) {
+        if (NameFactory::CONSTRAINT_GENERATOR === $algo) {
             array_unshift($inputs, $this->database);
         }
 
diff --git a/tests/Propel/Tests/Generator/Model/PhpNameGeneratorTest.php b/tests/Propel/Tests/Generator/Model/PhpNameGeneratorTest.php
index 98ad6e9f20..dc3e03921b 100644
--- a/tests/Propel/Tests/Generator/Model/PhpNameGeneratorTest.php
+++ b/tests/Propel/Tests/Generator/Model/PhpNameGeneratorTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Model;
+
 use Propel\Generator\Model\PhpNameGenerator;
 use Propel\Tests\TestCase;
 
diff --git a/tests/Propel/Tests/Generator/Model/SchemaTest.php b/tests/Propel/Tests/Generator/Model/SchemaTest.php
index 556fa349c2..edd999d017 100644
--- a/tests/Propel/Tests/Generator/Model/SchemaTest.php
+++ b/tests/Propel/Tests/Generator/Model/SchemaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/TableTest.php b/tests/Propel/Tests/Generator/Model/TableTest.php
index ec462b371b..56a9857941 100644
--- a/tests/Propel/Tests/Generator/Model/TableTest.php
+++ b/tests/Propel/Tests/Generator/Model/TableTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Model/UniqueTest.php b/tests/Propel/Tests/Generator/Model/UniqueTest.php
index 50d3773358..89b59db389 100644
--- a/tests/Propel/Tests/Generator/Model/UniqueTest.php
+++ b/tests/Propel/Tests/Generator/Model/UniqueTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
@@ -22,6 +20,10 @@ class UniqueTest extends ModelTestCase
     /**
      * @dataProvider provideTableSpecificAttributes
      *
+     * @param string $tableName
+     * @param int $maxColumnNameLength
+     * @param string $indexName
+     *
      * @return void
      */
     public function testCreateDefaultUniqueIndexName($tableName, $maxColumnNameLength, $indexName)
@@ -45,6 +47,9 @@ public function testCreateDefaultUniqueIndexName($tableName, $maxColumnNameLengt
         $this->assertSame($indexName, $index->getName());
     }
 
+    /**
+     * @return array
+     */
     public function provideTableSpecificAttributes()
     {
         return [
diff --git a/tests/Propel/Tests/Generator/Model/VendorInfoTest.php b/tests/Propel/Tests/Generator/Model/VendorInfoTest.php
index b63cf02043..c130c5d62c 100644
--- a/tests/Propel/Tests/Generator/Model/VendorInfoTest.php
+++ b/tests/Propel/Tests/Generator/Model/VendorInfoTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Model;
diff --git a/tests/Propel/Tests/Generator/Platform/DefaultPlatformTest.php b/tests/Propel/Tests/Generator/Platform/DefaultPlatformTest.php
index 399af21aa0..e86a0318b1 100644
--- a/tests/Propel/Tests/Generator/Platform/DefaultPlatformTest.php
+++ b/tests/Propel/Tests/Generator/Platform/DefaultPlatformTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
+namespace Propel\Tests\Generator\Platform;
+
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\PropelTypes;
 use Propel\Generator\Platform\DefaultPlatform;
@@ -20,7 +20,7 @@ class DefaultPlatformTest extends TestCase
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Platform/MssqlPlatformTest.php b/tests/Propel/Tests/Generator/Platform/MssqlPlatformTest.php
index fc7d5829ba..feb86af306 100644
--- a/tests/Propel/Tests/Generator/Platform/MssqlPlatformTest.php
+++ b/tests/Propel/Tests/Generator/Platform/MssqlPlatformTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
diff --git a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationMyISAMTest.php b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationMyISAMTest.php
index 42a759a512..29cc0f0585 100644
--- a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationMyISAMTest.php
+++ b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationMyISAMTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -20,7 +18,7 @@ class MysqlPlatformMigrationMyISAMTest extends PlatformMigrationTestProvider
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTest.php b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTest.php
index 693ce05f98..c95a222a93 100644
--- a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTest.php
+++ b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -16,12 +14,15 @@
 
 class MysqlPlatformMigrationTest extends MysqlPlatformMigrationTestProvider
 {
+    /**
+     * @var \Propel\Generator\Platform\PlatformInterface|null
+     */
     protected $platform;
 
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTestProvider.php b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTestProvider.php
index 7b0a79520d..f56039d9ba 100644
--- a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTestProvider.php
+++ b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTestProvider.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -15,6 +13,9 @@
  */
 class MysqlPlatformMigrationTestProvider extends PlatformMigrationTestProvider
 {
+    /**
+     * @return array
+     */
     public function providerForTestGetAddColumnFirstDDL()
     {
         $schema = <<<EOF
diff --git a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMyISAMTest.php b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMyISAMTest.php
index e7e3f5c085..886346a2c1 100644
--- a/tests/Propel/Tests/Generator/Platform/MysqlPlatformMyISAMTest.php
+++ b/tests/Propel/Tests/Generator/Platform/MysqlPlatformMyISAMTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
diff --git a/tests/Propel/Tests/Generator/Platform/MysqlPlatformTest.php b/tests/Propel/Tests/Generator/Platform/MysqlPlatformTest.php
index 062536286b..e6532bf323 100644
--- a/tests/Propel/Tests/Generator/Platform/MysqlPlatformTest.php
+++ b/tests/Propel/Tests/Generator/Platform/MysqlPlatformTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
diff --git a/tests/Propel/Tests/Generator/Platform/OraclePlatformMigrationTest.php b/tests/Propel/Tests/Generator/Platform/OraclePlatformMigrationTest.php
index 92908672cc..3e74ab1d79 100644
--- a/tests/Propel/Tests/Generator/Platform/OraclePlatformMigrationTest.php
+++ b/tests/Propel/Tests/Generator/Platform/OraclePlatformMigrationTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -18,7 +16,7 @@ class OraclePlatformMigrationTest extends PlatformMigrationTestProvider
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Platform/OraclePlatformTest.php b/tests/Propel/Tests/Generator/Platform/OraclePlatformTest.php
index e866e59725..1857956ccb 100644
--- a/tests/Propel/Tests/Generator/Platform/OraclePlatformTest.php
+++ b/tests/Propel/Tests/Generator/Platform/OraclePlatformTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -22,7 +20,7 @@ class OraclePlatformTest extends PlatformTestProvider
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Platform/PgsqlPlatformMigrationTest.php b/tests/Propel/Tests/Generator/Platform/PgsqlPlatformMigrationTest.php
index 020023e932..398c12f715 100755
--- a/tests/Propel/Tests/Generator/Platform/PgsqlPlatformMigrationTest.php
+++ b/tests/Propel/Tests/Generator/Platform/PgsqlPlatformMigrationTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -22,7 +20,7 @@ class PgsqlPlatformMigrationTest extends PlatformMigrationTestProvider
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Platform/PgsqlPlatformTest.php b/tests/Propel/Tests/Generator/Platform/PgsqlPlatformTest.php
index 59aaed0680..e840e3dd84 100755
--- a/tests/Propel/Tests/Generator/Platform/PgsqlPlatformTest.php
+++ b/tests/Propel/Tests/Generator/Platform/PgsqlPlatformTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
diff --git a/tests/Propel/Tests/Generator/Platform/PlatformMigrationTestProvider.php b/tests/Propel/Tests/Generator/Platform/PlatformMigrationTestProvider.php
index 721fe4d134..1b18b34d3b 100644
--- a/tests/Propel/Tests/Generator/Platform/PlatformMigrationTestProvider.php
+++ b/tests/Propel/Tests/Generator/Platform/PlatformMigrationTestProvider.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -21,6 +19,9 @@
  */
 abstract class PlatformMigrationTestProvider extends PlatformTestBase
 {
+    /**
+     * @return array
+     */
     public function providerForTestGetModifyDatabaseDDL()
     {
         $schema1 = <<<EOF
diff --git a/tests/Propel/Tests/Generator/Platform/PlatformTestBase.php b/tests/Propel/Tests/Generator/Platform/PlatformTestBase.php
index 46e82df92f..bb7b5ba342 100644
--- a/tests/Propel/Tests/Generator/Platform/PlatformTestBase.php
+++ b/tests/Propel/Tests/Generator/Platform/PlatformTestBase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
diff --git a/tests/Propel/Tests/Generator/Platform/PlatformTestProvider.php b/tests/Propel/Tests/Generator/Platform/PlatformTestProvider.php
index 52632e2fb6..037063e4b6 100644
--- a/tests/Propel/Tests/Generator/Platform/PlatformTestProvider.php
+++ b/tests/Propel/Tests/Generator/Platform/PlatformTestProvider.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -23,6 +21,9 @@
  */
 abstract class PlatformTestProvider extends PlatformTestBase
 {
+    /**
+     * @return string[][]
+     */
     public function providerForTestGetAddTablesDDL()
     {
         $schema = <<<EOF
diff --git a/tests/Propel/Tests/Generator/Platform/SqlitePlatformTest.php b/tests/Propel/Tests/Generator/Platform/SqlitePlatformTest.php
index 1030e322c3..dd85e8d4e1 100644
--- a/tests/Propel/Tests/Generator/Platform/SqlitePlatformTest.php
+++ b/tests/Propel/Tests/Generator/Platform/SqlitePlatformTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Platform;
@@ -24,7 +22,7 @@ class SqlitePlatformTest extends PlatformTestProvider
     /**
      * Get the Platform object for this class
      *
-     * @return Platform
+     * @return \Propel\Generator\Platform\PlatformInterface
      */
     protected function getPlatform()
     {
diff --git a/tests/Propel/Tests/Generator/Reverse/MssqlSchemaParserTest.php b/tests/Propel/Tests/Generator/Reverse/MssqlSchemaParserTest.php
index 10d0e5dfaf..4a9eda9d01 100644
--- a/tests/Propel/Tests/Generator/Reverse/MssqlSchemaParserTest.php
+++ b/tests/Propel/Tests/Generator/Reverse/MssqlSchemaParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Reverse;
diff --git a/tests/Propel/Tests/Generator/Reverse/MysqlSchemaParserTest.php b/tests/Propel/Tests/Generator/Reverse/MysqlSchemaParserTest.php
index e71106ff32..9a9ef56218 100644
--- a/tests/Propel/Tests/Generator/Reverse/MysqlSchemaParserTest.php
+++ b/tests/Propel/Tests/Generator/Reverse/MysqlSchemaParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Reverse;
diff --git a/tests/Propel/Tests/Generator/Reverse/PgsqlSchemaParserTest.php b/tests/Propel/Tests/Generator/Reverse/PgsqlSchemaParserTest.php
index 49d5def7e3..e43b08446f 100644
--- a/tests/Propel/Tests/Generator/Reverse/PgsqlSchemaParserTest.php
+++ b/tests/Propel/Tests/Generator/Reverse/PgsqlSchemaParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Reverse;
diff --git a/tests/Propel/Tests/Generator/Schema/Dumper/XmlDumperTest.php b/tests/Propel/Tests/Generator/Schema/Dumper/XmlDumperTest.php
index 77316f0877..defaf581ff 100644
--- a/tests/Propel/Tests/Generator/Schema/Dumper/XmlDumperTest.php
+++ b/tests/Propel/Tests/Generator/Schema/Dumper/XmlDumperTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Schema\Dumper;
 
 use PHPUnit\Framework\TestCase;
@@ -34,6 +40,11 @@ public function testDumpSchema()
         $this->assertSame($this->getExpectedXml('blog-schema.xml'), $this->dumper->dumpSchema($schema, true));
     }
 
+    /**
+     * @param string $filename
+     *
+     * @return string
+     */
     protected function getExpectedXml($filename)
     {
         return trim(file_get_contents(realpath(__DIR__ . '/../../../Resources/' . $filename)));
diff --git a/tests/Propel/Tests/Generator/Util/PhpParserTest.php b/tests/Propel/Tests/Generator/Util/PhpParserTest.php
index c4f8b54ba2..1e8f7b06de 100644
--- a/tests/Propel/Tests/Generator/Util/PhpParserTest.php
+++ b/tests/Propel/Tests/Generator/Util/PhpParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Util;
diff --git a/tests/Propel/Tests/Generator/Util/QuickBuilderTest.php b/tests/Propel/Tests/Generator/Util/QuickBuilderTest.php
index 3a12790d1b..1b0d46e998 100644
--- a/tests/Propel/Tests/Generator/Util/QuickBuilderTest.php
+++ b/tests/Propel/Tests/Generator/Util/QuickBuilderTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Util;
diff --git a/tests/Propel/Tests/Generator/Util/SchemaValidatorTest.php b/tests/Propel/Tests/Generator/Util/SchemaValidatorTest.php
index 7d5688ec84..bcd81128f8 100644
--- a/tests/Propel/Tests/Generator/Util/SchemaValidatorTest.php
+++ b/tests/Propel/Tests/Generator/Util/SchemaValidatorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Generator\Util;
diff --git a/tests/Propel/Tests/Generator/Util/SqlParserTest.php b/tests/Propel/Tests/Generator/Util/SqlParserTest.php
index 3c5ecd3d4a..3ac50d4ff2 100644
--- a/tests/Propel/Tests/Generator/Util/SqlParserTest.php
+++ b/tests/Propel/Tests/Generator/Util/SqlParserTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Generator\Util;
 
 /**
diff --git a/tests/Propel/Tests/Helpers/BaseTestCase.php b/tests/Propel/Tests/Helpers/BaseTestCase.php
index bf39313ef6..d8b111f548 100644
--- a/tests/Propel/Tests/Helpers/BaseTestCase.php
+++ b/tests/Propel/Tests/Helpers/BaseTestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehavior.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehavior.php
index 8b2711d5b0..f669d923ed 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehavior.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehavior.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehaviorBuilder.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehaviorBuilder.php
index bc0d69de8c..062faa9282 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehaviorBuilder.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/AddClassBehaviorBuilder.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
 
 use Propel\Generator\Builder\Om\AbstractOMBuilder;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/DonothingBehavior.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/DonothingBehavior.php
index 2da8750cc4..4cdb9437ea 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/DonothingBehavior.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/DonothingBehavior.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthor.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthor.php
index 1fdeeea059..b691eddfcc 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthor.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthor.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorDeleteFalse.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorDeleteFalse.php
index e0508e0c66..daa62904e3 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorDeleteFalse.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorDeleteFalse.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
 
 use Propel\Runtime\Connection\ConnectionInterface;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorSaveFalse.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorSaveFalse.php
index 9d4744045b..03d009ed49 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorSaveFalse.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/TestAuthorSaveFalse.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
 
 use Propel\Runtime\Connection\ConnectionInterface;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/Behavior/Testallhooksbehavior.php b/tests/Propel/Tests/Helpers/Bookstore/Behavior/Testallhooksbehavior.php
index 3ad8d363d0..ad1775b048 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/Behavior/Testallhooksbehavior.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/Behavior/Testallhooksbehavior.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore\Behavior;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/BookstoreDataPopulator.php b/tests/Propel/Tests/Helpers/Bookstore/BookstoreDataPopulator.php
index d63df4575d..dad2b07202 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/BookstoreDataPopulator.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/BookstoreDataPopulator.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/BookstoreEmptyTestBase.php b/tests/Propel/Tests/Helpers/Bookstore/BookstoreEmptyTestBase.php
index 6f699860c4..539c6968e6 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/BookstoreEmptyTestBase.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/BookstoreEmptyTestBase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore;
diff --git a/tests/Propel/Tests/Helpers/Bookstore/BookstoreTestBase.php b/tests/Propel/Tests/Helpers/Bookstore/BookstoreTestBase.php
index e636ee0bf7..f55bfa9cd8 100644
--- a/tests/Propel/Tests/Helpers/Bookstore/BookstoreTestBase.php
+++ b/tests/Propel/Tests/Helpers/Bookstore/BookstoreTestBase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Bookstore;
diff --git a/tests/Propel/Tests/Helpers/MultipleBehavior.php b/tests/Propel/Tests/Helpers/MultipleBehavior.php
index 0cbf93a872..09dd8d26e7 100644
--- a/tests/Propel/Tests/Helpers/MultipleBehavior.php
+++ b/tests/Propel/Tests/Helpers/MultipleBehavior.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers;
@@ -14,6 +12,9 @@
 
 class MultipleBehavior extends Behavior
 {
+    /**
+     * @return bool
+     */
     public function allowMultiple()
     {
         return true;
diff --git a/tests/Propel/Tests/Helpers/Namespaces/NamespacesTestBase.php b/tests/Propel/Tests/Helpers/Namespaces/NamespacesTestBase.php
index 4ef7f1c109..59f333ee13 100644
--- a/tests/Propel/Tests/Helpers/Namespaces/NamespacesTestBase.php
+++ b/tests/Propel/Tests/Helpers/Namespaces/NamespacesTestBase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Helpers\Namespaces;
diff --git a/tests/Propel/Tests/Helpers/NoSchemaPlatform.php b/tests/Propel/Tests/Helpers/NoSchemaPlatform.php
index c70aca2f6d..2fa14c1beb 100644
--- a/tests/Propel/Tests/Helpers/NoSchemaPlatform.php
+++ b/tests/Propel/Tests/Helpers/NoSchemaPlatform.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Helpers;
 
 class NoSchemaPlatform
diff --git a/tests/Propel/Tests/Helpers/PlatformDatabaseBuildTimeBase.php b/tests/Propel/Tests/Helpers/PlatformDatabaseBuildTimeBase.php
index 5ea45814ed..e936c9da10 100644
--- a/tests/Propel/Tests/Helpers/PlatformDatabaseBuildTimeBase.php
+++ b/tests/Propel/Tests/Helpers/PlatformDatabaseBuildTimeBase.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Helpers;
 
 use Propel\Generator\Config\QuickGeneratorConfig;
diff --git a/tests/Propel/Tests/Helpers/SchemaPlatform.php b/tests/Propel/Tests/Helpers/SchemaPlatform.php
index ef55f801b8..e6e90c2e05 100644
--- a/tests/Propel/Tests/Helpers/SchemaPlatform.php
+++ b/tests/Propel/Tests/Helpers/SchemaPlatform.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Helpers;
 
 class SchemaPlatform
diff --git a/tests/Propel/Tests/Issues/Issue1033Book.php b/tests/Propel/Tests/Issues/Issue1033Book.php
index 7133ffcebf..b6f3a5b0cf 100644
--- a/tests/Propel/Tests/Issues/Issue1033Book.php
+++ b/tests/Propel/Tests/Issues/Issue1033Book.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Base\Issue1033Book as BaseIssue1033Book;
diff --git a/tests/Propel/Tests/Issues/Issue1033Test.php b/tests/Propel/Tests/Issues/Issue1033Test.php
index 46f4656501..22f12a5db9 100644
--- a/tests/Propel/Tests/Issues/Issue1033Test.php
+++ b/tests/Propel/Tests/Issues/Issue1033Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Exception;
diff --git a/tests/Propel/Tests/Issues/Issue1133Test.php b/tests/Propel/Tests/Issues/Issue1133Test.php
index 45f377f6c6..cb54344445 100644
--- a/tests/Propel/Tests/Issues/Issue1133Test.php
+++ b/tests/Propel/Tests/Issues/Issue1133Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Propel\Runtime\Collection\ObjectCollection;
@@ -7,18 +13,30 @@
 
 class DummyObject
 {
+    /**
+     * @var mixed
+     */
     private $id;
 
+    /**
+     * @param mixed $id
+     */
     public function __construct($id)
     {
         $this->id = $id;
     }
 
+    /**
+     * @return mixed
+     */
     public function getId()
     {
         return $this->id;
     }
 
+    /**
+     * @return string
+     */
     public function hashCode()
     {
         return (string)$this->id;
diff --git a/tests/Propel/Tests/Issues/Issue1192Test.php b/tests/Propel/Tests/Issues/Issue1192Test.php
index f4d7081c29..aab75ae9c4 100644
--- a/tests/Propel/Tests/Issues/Issue1192Test.php
+++ b/tests/Propel/Tests/Issues/Issue1192Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Issue1192ItemQuery;
diff --git a/tests/Propel/Tests/Issues/Issue1463Test.php b/tests/Propel/Tests/Issues/Issue1463Test.php
index 9cdbed3f7b..75970fa4b7 100644
--- a/tests/Propel/Tests/Issues/Issue1463Test.php
+++ b/tests/Propel/Tests/Issues/Issue1463Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Issue1463ItemQuery;
diff --git a/tests/Propel/Tests/Issues/Issue617Test.php b/tests/Propel/Tests/Issues/Issue617Test.php
index db57e6f532..13ca8966a4 100644
--- a/tests/Propel/Tests/Issues/Issue617Test.php
+++ b/tests/Propel/Tests/Issues/Issue617Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Propel\Generator\Model\Diff\DatabaseComparator;
diff --git a/tests/Propel/Tests/Issues/Issue646Test.php b/tests/Propel/Tests/Issues/Issue646Test.php
index e614f9a68f..98a0e213c5 100644
--- a/tests/Propel/Tests/Issues/Issue646Test.php
+++ b/tests/Propel/Tests/Issues/Issue646Test.php
@@ -1,10 +1,9 @@
 <?php
+
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Issues;
diff --git a/tests/Propel/Tests/Issues/Issue656Test.php b/tests/Propel/Tests/Issues/Issue656Test.php
index a85405affc..812e90d06d 100644
--- a/tests/Propel/Tests/Issues/Issue656Test.php
+++ b/tests/Propel/Tests/Issues/Issue656Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Issue656TestObject;
diff --git a/tests/Propel/Tests/Issues/Issue675Test.php b/tests/Propel/Tests/Issues/Issue675Test.php
index 71950bbdbe..f353301eb5 100644
--- a/tests/Propel/Tests/Issues/Issue675Test.php
+++ b/tests/Propel/Tests/Issues/Issue675Test.php
@@ -1,10 +1,9 @@
 <?php
+
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Issues;
diff --git a/tests/Propel/Tests/Issues/Issue730Test.php b/tests/Propel/Tests/Issues/Issue730Test.php
index 95d44d0be9..ec422d5a05 100644
--- a/tests/Propel/Tests/Issues/Issue730Test.php
+++ b/tests/Propel/Tests/Issues/Issue730Test.php
@@ -1,10 +1,9 @@
 <?php
+
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Issues;
diff --git a/tests/Propel/Tests/Issues/Issue733Test.php b/tests/Propel/Tests/Issues/Issue733Test.php
index 543040e2ef..7d223e1e46 100644
--- a/tests/Propel/Tests/Issues/Issue733Test.php
+++ b/tests/Propel/Tests/Issues/Issue733Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Issue733Test1;
diff --git a/tests/Propel/Tests/Issues/Issue768Test.php b/tests/Propel/Tests/Issues/Issue768Test.php
index 0f01aec0d6..b8db3e8e77 100644
--- a/tests/Propel/Tests/Issues/Issue768Test.php
+++ b/tests/Propel/Tests/Issues/Issue768Test.php
@@ -1,10 +1,9 @@
 <?php
+
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Issues;
diff --git a/tests/Propel/Tests/Issues/Issue829Test.php b/tests/Propel/Tests/Issues/Issue829Test.php
index 566d3811da..8ffffec95c 100644
--- a/tests/Propel/Tests/Issues/Issue829Test.php
+++ b/tests/Propel/Tests/Issues/Issue829Test.php
@@ -1,10 +1,9 @@
 <?php
+
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Issues;
diff --git a/tests/Propel/Tests/Issues/Issue915Book.php b/tests/Propel/Tests/Issues/Issue915Book.php
index e12d717bcf..342647a42b 100644
--- a/tests/Propel/Tests/Issues/Issue915Book.php
+++ b/tests/Propel/Tests/Issues/Issue915Book.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Base\Issue915Book as BaseIssue915Book;
diff --git a/tests/Propel/Tests/Issues/Issue915Test.php b/tests/Propel/Tests/Issues/Issue915Test.php
index 52de0c416d..05fb913c15 100644
--- a/tests/Propel/Tests/Issues/Issue915Test.php
+++ b/tests/Propel/Tests/Issues/Issue915Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Propel\Generator\Util\QuickBuilder;
diff --git a/tests/Propel/Tests/Issues/Issue989Test.php b/tests/Propel/Tests/Issues/Issue989Test.php
index de7f4efaef..d21f839a33 100644
--- a/tests/Propel/Tests/Issues/Issue989Test.php
+++ b/tests/Propel/Tests/Issues/Issue989Test.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Issues;
 
 use Nature;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaCombineTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaCombineTest.php
index fde83979e6..fa6435abd8 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaCombineTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaCombineTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
@@ -35,7 +33,7 @@ class CriteriaCombineTest extends BaseTestCase
     /**
      * DB adapter saved for later.
      *
-     * @var AbstractAdapter
+     * @var \Propel\Runtime\Adapter\AdapterInterface
      */
     private $savedAdapter;
 
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidConditionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidConditionTest.php
index 2c77390105..6d2500d79b 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidConditionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidConditionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
@@ -17,7 +15,6 @@
  * Test class for Criteria fluid conditions.
  *
  * @author Francois Zaninotto
- * @version $Id: CriteriaCombineTest.php 1347 2009-12-03 21:06:36Z francois $
  */
 class CriteriaFluidConditionTest extends BaseTestCase
 {
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidOperatorTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidOperatorTest.php
index 97839ad7b7..b5f187f314 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidOperatorTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaFluidOperatorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaMergeTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaMergeTest.php
index 6d40d7c021..2894c36c3c 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaMergeTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaMergeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php
index 06a0b9fe02..47cd089bbe 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicCriterionTest.php
index 159662bcee..862ce1296c 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
@@ -135,7 +133,7 @@ public function testAppendPsCanHandleNotEqualToNull()
     }
 
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicModelCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicModelCriterionTest.php
index 5019dd01af..8f2fc9d126 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicModelCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/BasicModelCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
@@ -40,7 +38,7 @@ public function testAppendPsToAddsBindingInfoForNotNullValues()
     }
 
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/CustomCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/CustomCriterionTest.php
index c5fb2ac145..2bcc4c6ab0 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/CustomCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/CustomCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InCriterionTest.php
index ebb3785845..9f39ed0b24 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InModelCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InModelCriterionTest.php
index 53b7669e59..0ee957e585 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InModelCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/InModelCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeCriterionTest.php
index ec68f8e49f..cab5ce081e 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeModelCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeModelCriterionTest.php
index a087f46c35..836ffe47e9 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeModelCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/LikeModelCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
@@ -60,7 +58,7 @@ public function testAppendPsToCreatesANotLikeConditionIfSpecified()
     }
 
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawCriterionTest.php
index 69e5fe56da..b86e07afd0 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
@@ -23,7 +21,7 @@
 class RawCriterionTest extends BaseTestCase
 {
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawModelCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawModelCriterionTest.php
index 9896877862..ebdd8929c7 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawModelCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/RawModelCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
@@ -23,7 +21,7 @@
 class RawModelCriterionTest extends BaseTestCase
 {
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/SeveralModelCriterionTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/SeveralModelCriterionTest.php
index c9ad9f99eb..01b1bf5b56 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/SeveralModelCriterionTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/Criterion/SeveralModelCriterionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
@@ -41,7 +39,7 @@ public function testAppendPsToAddsBindingInfoForNotNullValues()
     }
 
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
      *
      * @return void
      */
@@ -55,7 +53,7 @@ public function testAppendPsToThrowsExceptionWhenOneOfTheValuesIsNull()
     }
 
     /**
-     * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
+     * @expectedException \Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/JoinTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/JoinTest.php
index a848d4d886..214ac0af4d 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/JoinTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/JoinTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaForUseQuery.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaForUseQuery.php
index 33ff280ce9..d3066ac322 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaForUseQuery.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaForUseQuery.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Runtime\ActiveQuery;
 
 use Propel\Runtime\ActiveQuery\Criteria;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaGroupByArrayTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaGroupByArrayTest.php
index 5e917ee2ee..1c4c41f0ad 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaGroupByArrayTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaGroupByArrayTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaHooksTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaHooksTest.php
index 0c0c6ea53d..43aaed82c6 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaHooksTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaHooksTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaSelectTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaSelectTest.php
index e9a7a1ee66..2221a8b323 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaSelectTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaSelectTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaTest.php
index 5d360f0d28..6c4eadd19f 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
@@ -1880,7 +1878,7 @@ public function testFindOneOrCreateExists()
     }
 
     /**
-     * @expectedException Propel\Runtime\Exception\PropelException
+     * @expectedException \Propel\Runtime\Exception\PropelException
      *
      * @return void
      */
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithNamespaceTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithNamespaceTest.php
index 2c643ce4e5..a08da385c0 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithNamespaceTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithNamespaceTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithSchemaTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithSchemaTest.php
index b89104aac6..03f986220e 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithSchemaTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelCriteriaWithSchemaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelJoinTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelJoinTest.php
index a31dac37d2..60b5236ddc 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelJoinTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelJoinTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/ModelWithTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/ModelWithTest.php
index f5f6180179..23c622d6c1 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/ModelWithTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/ModelWithTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTest.php
index 7524633c1e..8d47b77787 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTestClasses.php b/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTestClasses.php
index 1a73c9b7f7..292fa74040 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTestClasses.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/PropelQueryTestClasses.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/QuotingTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/QuotingTest.php
index c179f16eb2..b1c5382d23 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/QuotingTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/QuotingTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTest.php
index f16ee964b3..4321b83ce5 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTestClasses.php b/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTestClasses.php
index 34d12c998c..d15c72b400 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTestClasses.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/SubQueryTestClasses.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveQuery;
diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/TestableModelCriteria.php b/tests/Propel/Tests/Runtime/ActiveQuery/TestableModelCriteria.php
index 6fa5c15558..f7d3655fa3 100644
--- a/tests/Propel/Tests/Runtime/ActiveQuery/TestableModelCriteria.php
+++ b/tests/Propel/Tests/Runtime/ActiveQuery/TestableModelCriteria.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Runtime\ActiveQuery;
 
 use Propel\Runtime\ActiveQuery\ModelCriteria;
diff --git a/tests/Propel/Tests/Runtime/ActiveRecordConvertTest.php b/tests/Propel/Tests/Runtime/ActiveRecordConvertTest.php
index acf2649284..151761711e 100644
--- a/tests/Propel/Tests/Runtime/ActiveRecordConvertTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveRecordConvertTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveRecord;
diff --git a/tests/Propel/Tests/Runtime/ActiveRecordSerializeTest.php b/tests/Propel/Tests/Runtime/ActiveRecordSerializeTest.php
index 623cc40b1b..1ce57f3562 100644
--- a/tests/Propel/Tests/Runtime/ActiveRecordSerializeTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveRecordSerializeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveRecord;
diff --git a/tests/Propel/Tests/Runtime/ActiveRecordTest.php b/tests/Propel/Tests/Runtime/ActiveRecordTest.php
index 5c7bd362d7..da6ced00b7 100644
--- a/tests/Propel/Tests/Runtime/ActiveRecordTest.php
+++ b/tests/Propel/Tests/Runtime/ActiveRecordTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveRecord;
diff --git a/tests/Propel/Tests/Runtime/ActiveRecordTestClasses.php b/tests/Propel/Tests/Runtime/ActiveRecordTestClasses.php
index c727ac2104..bfe1b31ea9 100644
--- a/tests/Propel/Tests/Runtime/ActiveRecordTestClasses.php
+++ b/tests/Propel/Tests/Runtime/ActiveRecordTestClasses.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ActiveRecord;
diff --git a/tests/Propel/Tests/Runtime/Adapter/AbstractAdapterTest.php b/tests/Propel/Tests/Runtime/Adapter/AbstractAdapterTest.php
index e2edd4d981..9d4a0c344f 100644
--- a/tests/Propel/Tests/Runtime/Adapter/AbstractAdapterTest.php
+++ b/tests/Propel/Tests/Runtime/Adapter/AbstractAdapterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Adapter;
diff --git a/tests/Propel/Tests/Runtime/Adapter/Pdo/MssqlAdapterTest.php b/tests/Propel/Tests/Runtime/Adapter/Pdo/MssqlAdapterTest.php
index 5fad166b4f..88ded4b920 100644
--- a/tests/Propel/Tests/Runtime/Adapter/Pdo/MssqlAdapterTest.php
+++ b/tests/Propel/Tests/Runtime/Adapter/Pdo/MssqlAdapterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Adapter\Pdo;
@@ -24,17 +22,10 @@
  */
 class MssqlAdapterTest extends TestCase
 {
-    /**
-     * The criteria to use in the test.
-     *
-     * @var \Propel\Runtime\ActiveQuery\Criteria
-     */
-    private $c;
-
     /**
      * DB adapter saved for later.
      *
-     * @var AbstractAdapter
+     * @var \Propel\Runtime\Adapter\AdapterInterface
      */
     private $savedAdapter;
 
@@ -72,6 +63,9 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
+    /**
+     * @return string
+     */
     protected function getDriver()
     {
         return 'mssql';
diff --git a/tests/Propel/Tests/Runtime/Adapter/Pdo/MysqlAdapterTest.php b/tests/Propel/Tests/Runtime/Adapter/Pdo/MysqlAdapterTest.php
index 9f3f3899ae..637cf3a21d 100644
--- a/tests/Propel/Tests/Runtime/Adapter/Pdo/MysqlAdapterTest.php
+++ b/tests/Propel/Tests/Runtime/Adapter/Pdo/MysqlAdapterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Adapter\Pdo;
@@ -21,6 +19,9 @@
  */
 class MysqlAdapterTest extends TestCaseFixtures
 {
+    /**
+     * @return array
+     */
     public static function getConParams()
     {
         return [
@@ -38,12 +39,16 @@ public static function getConParams()
     /**
      * @dataProvider getConParams
      *
+     * @param array $conparams
+     *
      * @return void
      */
     public function testPrepareParamsThrowsException($conparams)
     {
         $db = new TestableMysqlAdapter();
-        $db->prepareParams($conparams);
+        $result = $db->prepareParams($conparams);
+
+        $this->assertIsArray($result);
     }
 
     /**
@@ -94,6 +99,11 @@ protected function getPdoMock()
 
 class TestableMysqlAdapter extends MysqlAdapter
 {
+    /**
+     * @param array $conparams
+     *
+     * @return array
+     */
     public function prepareParams($conparams)
     {
         return parent::prepareParams($conparams);
diff --git a/tests/Propel/Tests/Runtime/Adapter/Pdo/OracleAdapterTest.php b/tests/Propel/Tests/Runtime/Adapter/Pdo/OracleAdapterTest.php
index 38a9da1c9e..f674e0e31b 100644
--- a/tests/Propel/Tests/Runtime/Adapter/Pdo/OracleAdapterTest.php
+++ b/tests/Propel/Tests/Runtime/Adapter/Pdo/OracleAdapterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Adapter\Pdo;
diff --git a/tests/Propel/Tests/Runtime/Adapter/Pdo/PgsqlAdapter.php b/tests/Propel/Tests/Runtime/Adapter/Pdo/PgsqlAdapter.php
index b97a9af814..dfce6a1600 100644
--- a/tests/Propel/Tests/Runtime/Adapter/Pdo/PgsqlAdapter.php
+++ b/tests/Propel/Tests/Runtime/Adapter/Pdo/PgsqlAdapter.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Adapter\Pdo;
diff --git a/tests/Propel/Tests/Runtime/Collection/ArrayCollectionTest.php b/tests/Propel/Tests/Runtime/Collection/ArrayCollectionTest.php
index 370e37710d..b02165588b 100644
--- a/tests/Propel/Tests/Runtime/Collection/ArrayCollectionTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/ArrayCollectionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Collection;
diff --git a/tests/Propel/Tests/Runtime/Collection/CollectionConvertTest.php b/tests/Propel/Tests/Runtime/Collection/CollectionConvertTest.php
index 6c00f10d0d..4793d1be5e 100644
--- a/tests/Propel/Tests/Runtime/Collection/CollectionConvertTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/CollectionConvertTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Collection;
@@ -19,7 +17,6 @@
  * Test class for Collection.
  *
  * @author Francois Zaninotto
- * @version $Id: CollectionTest.php 1348 2009-12-03 21:49:00Z francois $
  */
 class CollectionConvertTest extends TestCaseFixtures
 {
diff --git a/tests/Propel/Tests/Runtime/Collection/CollectionIteratorTest.php b/tests/Propel/Tests/Runtime/Collection/CollectionIteratorTest.php
index f5694eeb70..1e3e4923a0 100644
--- a/tests/Propel/Tests/Runtime/Collection/CollectionIteratorTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/CollectionIteratorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Collection;
diff --git a/tests/Propel/Tests/Runtime/Collection/CollectionTest.php b/tests/Propel/Tests/Runtime/Collection/CollectionTest.php
index d0afce0800..b8b0bfaea9 100644
--- a/tests/Propel/Tests/Runtime/Collection/CollectionTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/CollectionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\collection;
diff --git a/tests/Propel/Tests/Runtime/Collection/ObjectCollectionTest.php b/tests/Propel/Tests/Runtime/Collection/ObjectCollectionTest.php
index 2b6cf998ec..9c911e03f8 100644
--- a/tests/Propel/Tests/Runtime/Collection/ObjectCollectionTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/ObjectCollectionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Collection;
diff --git a/tests/Propel/Tests/Runtime/Collection/ObjectCollectionWithFixturesTest.php b/tests/Propel/Tests/Runtime/Collection/ObjectCollectionWithFixturesTest.php
index 6fd84bfd0f..27bb94b498 100644
--- a/tests/Propel/Tests/Runtime/Collection/ObjectCollectionWithFixturesTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/ObjectCollectionWithFixturesTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\collection;
diff --git a/tests/Propel/Tests/Runtime/Collection/OnDemandCollectionTest.php b/tests/Propel/Tests/Runtime/Collection/OnDemandCollectionTest.php
index aa6a2bd784..438f63778d 100644
--- a/tests/Propel/Tests/Runtime/Collection/OnDemandCollectionTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/OnDemandCollectionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Collection;
diff --git a/tests/Propel/Tests/Runtime/Collection/OnDemandIteratorTest.php b/tests/Propel/Tests/Runtime/Collection/OnDemandIteratorTest.php
index e5ea2bf5b8..254dfce2b8 100644
--- a/tests/Propel/Tests/Runtime/Collection/OnDemandIteratorTest.php
+++ b/tests/Propel/Tests/Runtime/Collection/OnDemandIteratorTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\collection;
diff --git a/tests/Propel/Tests/Runtime/Connection/ConnectionFactoryTest.php b/tests/Propel/Tests/Runtime/Connection/ConnectionFactoryTest.php
index 0201652fe5..06515a3e0e 100644
--- a/tests/Propel/Tests/Runtime/Connection/ConnectionFactoryTest.php
+++ b/tests/Propel/Tests/Runtime/Connection/ConnectionFactoryTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Connection;
diff --git a/tests/Propel/Tests/Runtime/Connection/ConnectionManagerMasterSlaveTest.php b/tests/Propel/Tests/Runtime/Connection/ConnectionManagerMasterSlaveTest.php
index 7ef9868fab..97c3689742 100644
--- a/tests/Propel/Tests/Runtime/Connection/ConnectionManagerMasterSlaveTest.php
+++ b/tests/Propel/Tests/Runtime/Connection/ConnectionManagerMasterSlaveTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Connection;
diff --git a/tests/Propel/Tests/Runtime/Connection/ConnectionManagerPrimaryReplicaTest.php b/tests/Propel/Tests/Runtime/Connection/ConnectionManagerPrimaryReplicaTest.php
index 5b35d6bedf..9189d89c78 100644
--- a/tests/Propel/Tests/Runtime/Connection/ConnectionManagerPrimaryReplicaTest.php
+++ b/tests/Propel/Tests/Runtime/Connection/ConnectionManagerPrimaryReplicaTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Connection;
diff --git a/tests/Propel/Tests/Runtime/Connection/ConnectionManagerSingleTest.php b/tests/Propel/Tests/Runtime/Connection/ConnectionManagerSingleTest.php
index e460e04184..346cd283b0 100644
--- a/tests/Propel/Tests/Runtime/Connection/ConnectionManagerSingleTest.php
+++ b/tests/Propel/Tests/Runtime/Connection/ConnectionManagerSingleTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Connection;
diff --git a/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php b/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php
index 447d5931bc..5ec4b1fb8f 100644
--- a/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php
+++ b/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Connection;
diff --git a/tests/Propel/Tests/Runtime/Connection/TransactionTraitTest.php b/tests/Propel/Tests/Runtime/Connection/TransactionTraitTest.php
index b792f886d2..4891e83253 100644
--- a/tests/Propel/Tests/Runtime/Connection/TransactionTraitTest.php
+++ b/tests/Propel/Tests/Runtime/Connection/TransactionTraitTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Connection;
diff --git a/tests/Propel/Tests/Runtime/Exception/PropelExceptionTest.php b/tests/Propel/Tests/Runtime/Exception/PropelExceptionTest.php
index c6d34065b9..a806f8d1aa 100644
--- a/tests/Propel/Tests/Runtime/Exception/PropelExceptionTest.php
+++ b/tests/Propel/Tests/Runtime/Exception/PropelExceptionTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Exception;
@@ -44,6 +42,8 @@ public function testCompositeConstructor()
     /**
      * @expectedException \Propel\Runtime\Exception\PropelException
      *
+     * @throws \Propel\Runtime\Exception\PropelException
+     *
      * @return void
      */
     public function testIsThrowable()
diff --git a/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterTest.php b/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterTest.php
index b989e979bb..f70e6cd9a9 100644
--- a/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterWithTest.php b/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterWithTest.php
index 0ba83f3cf6..a1f6f7cc58 100644
--- a/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterWithTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/ArrayFormatterWithTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/DataFetcherTest.php b/tests/Propel/Tests/Runtime/Formatter/DataFetcherTest.php
index a0d8c9015f..f9e224ebb1 100644
--- a/tests/Propel/Tests/Runtime/Formatter/DataFetcherTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/DataFetcherTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterInheritanceTest.php b/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterInheritanceTest.php
index b0ddb22f64..54f5c1b6a6 100644
--- a/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterInheritanceTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterInheritanceTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterTest.php b/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterTest.php
index 347027adbb..563bb03ed0 100644
--- a/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterWithTest.php b/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterWithTest.php
index f7db57dddb..07c5980b38 100644
--- a/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterWithTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/ObjectFormatterWithTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterTest.php b/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterTest.php
index 081f1975bb..fdc417922b 100644
--- a/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterWithTest.php b/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterWithTest.php
index 69a06bc3fb..a8941f5f2f 100644
--- a/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterWithTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterWithTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/SimpleArrayFormatterTest.php b/tests/Propel/Tests/Runtime/Formatter/SimpleArrayFormatterTest.php
index a42dd7fad0..7991c934fb 100644
--- a/tests/Propel/Tests/Runtime/Formatter/SimpleArrayFormatterTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/SimpleArrayFormatterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Formatter/StatementFormatterTest.php b/tests/Propel/Tests/Runtime/Formatter/StatementFormatterTest.php
index 74be4b7b75..9a84bebc8b 100644
--- a/tests/Propel/Tests/Runtime/Formatter/StatementFormatterTest.php
+++ b/tests/Propel/Tests/Runtime/Formatter/StatementFormatterTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Formatter;
diff --git a/tests/Propel/Tests/Runtime/Map/ColumnMapTest.php b/tests/Propel/Tests/Runtime/Map/ColumnMapTest.php
index 71ab5a8c52..666c0113e5 100644
--- a/tests/Propel/Tests/Runtime/Map/ColumnMapTest.php
+++ b/tests/Propel/Tests/Runtime/Map/ColumnMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/DatabaseMapTest.php b/tests/Propel/Tests/Runtime/Map/DatabaseMapTest.php
index 59d3b8aee8..355fc2076f 100644
--- a/tests/Propel/Tests/Runtime/Map/DatabaseMapTest.php
+++ b/tests/Propel/Tests/Runtime/Map/DatabaseMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapTest.php b/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapTest.php
index 4c5466c6b8..42eea833c9 100644
--- a/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapTest.php
+++ b/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapWithSchemasTest.php b/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapWithSchemasTest.php
index 79369d1add..da0a341e51 100644
--- a/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapWithSchemasTest.php
+++ b/tests/Propel/Tests/Runtime/Map/GeneratedRelationMapWithSchemasTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalTest.php b/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalTest.php
index e9423fb6ce..f37c61b4b2 100644
--- a/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalTest.php
+++ b/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalWithSchemasTest.php b/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalWithSchemasTest.php
index e133f7bfca..6f7067db2b 100644
--- a/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalWithSchemasTest.php
+++ b/tests/Propel/Tests/Runtime/Map/RelatedMapSymmetricalWithSchemasTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/RelationMapTest.php b/tests/Propel/Tests/Runtime/Map/RelationMapTest.php
index 61efbd297a..a756cde3eb 100644
--- a/tests/Propel/Tests/Runtime/Map/RelationMapTest.php
+++ b/tests/Propel/Tests/Runtime/Map/RelationMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Map/TableMapTest.php b/tests/Propel/Tests/Runtime/Map/TableMapTest.php
index bba72a88f8..e5875f7e83 100644
--- a/tests/Propel/Tests/Runtime/Map/TableMapTest.php
+++ b/tests/Propel/Tests/Runtime/Map/TableMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Map;
diff --git a/tests/Propel/Tests/Runtime/Parser/AbstractParserTest.php b/tests/Propel/Tests/Runtime/Parser/AbstractParserTest.php
index 633743eea4..a89c544ba1 100644
--- a/tests/Propel/Tests/Runtime/Parser/AbstractParserTest.php
+++ b/tests/Propel/Tests/Runtime/Parser/AbstractParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Parser;
diff --git a/tests/Propel/Tests/Runtime/Parser/CsvParserTest.php b/tests/Propel/Tests/Runtime/Parser/CsvParserTest.php
index aa7e15ee93..5855c2229e 100644
--- a/tests/Propel/Tests/Runtime/Parser/CsvParserTest.php
+++ b/tests/Propel/Tests/Runtime/Parser/CsvParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Parser;
diff --git a/tests/Propel/Tests/Runtime/Parser/JsonParserTest.php b/tests/Propel/Tests/Runtime/Parser/JsonParserTest.php
index 2a4128a1aa..64285ee980 100644
--- a/tests/Propel/Tests/Runtime/Parser/JsonParserTest.php
+++ b/tests/Propel/Tests/Runtime/Parser/JsonParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Parser;
diff --git a/tests/Propel/Tests/Runtime/Parser/XmlParserTest.php b/tests/Propel/Tests/Runtime/Parser/XmlParserTest.php
index 9ad1b5911a..bd32f2cfe1 100644
--- a/tests/Propel/Tests/Runtime/Parser/XmlParserTest.php
+++ b/tests/Propel/Tests/Runtime/Parser/XmlParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Parser;
diff --git a/tests/Propel/Tests/Runtime/Parser/YamlParserTest.php b/tests/Propel/Tests/Runtime/Parser/YamlParserTest.php
index 5189859076..8b35c42cc3 100644
--- a/tests/Propel/Tests/Runtime/Parser/YamlParserTest.php
+++ b/tests/Propel/Tests/Runtime/Parser/YamlParserTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Parser;
diff --git a/tests/Propel/Tests/Runtime/PropelTest.php b/tests/Propel/Tests/Runtime/PropelTest.php
index bdf2947d04..77c19c6f0e 100644
--- a/tests/Propel/Tests/Runtime/PropelTest.php
+++ b/tests/Propel/Tests/Runtime/PropelTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime;
diff --git a/tests/Propel/Tests/Runtime/ServiceContainer/StandardServiceContainerTest.php b/tests/Propel/Tests/Runtime/ServiceContainer/StandardServiceContainerTest.php
index 6140968921..70399d8e3d 100644
--- a/tests/Propel/Tests/Runtime/ServiceContainer/StandardServiceContainerTest.php
+++ b/tests/Propel/Tests/Runtime/ServiceContainer/StandardServiceContainerTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\ServiceContainer;
@@ -458,9 +456,9 @@ public function testGetProfilerReturnsAProfiler()
      */
     public function testGetProfilerUsesProfilerClass()
     {
-        $this->sc->setProfilerClass('\Propel\Tests\Runtime\ServiceContainer\myProfiler');
+        $this->sc->setProfilerClass('\Propel\Tests\Runtime\ServiceContainer\MyProfiler');
         $profiler = $this->sc->getProfiler();
-        $this->assertInstanceOf('\Propel\Tests\Runtime\ServiceContainer\myProfiler', $profiler);
+        $this->assertInstanceOf('\Propel\Tests\Runtime\ServiceContainer\MyProfiler', $profiler);
     }
 
     /**
@@ -596,7 +594,7 @@ class MyDatabaseMap extends DatabaseMap
 {
 }
 
-class myProfiler extends Profiler
+class MyProfiler extends Profiler
 {
 }
 
diff --git a/tests/Propel/Tests/Runtime/TypeTest.php b/tests/Propel/Tests/Runtime/TypeTest.php
index 6888d0b0db..b460fb9fbf 100644
--- a/tests/Propel/Tests/Runtime/TypeTest.php
+++ b/tests/Propel/Tests/Runtime/TypeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime;
@@ -14,9 +12,9 @@
 use Propel\Tests\Bookstore\TypeObject;
 use Propel\Tests\Bookstore\TypeObjectQuery;
 use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
+use Propel\Tests\Runtime\TypeTests\DummyObjectClass;
 use Propel\Tests\Runtime\TypeTests\TypeObjectInterface;
 use ReflectionClass;
-use Propel\Tests\Runtime\TypeTests\DummyObjectClass;
 
 /**
  * @group database
@@ -98,7 +96,6 @@ public function testObjectType()
         $typeObjectEntity->setDetails($clone);
         $this->assertTrue($typeObjectEntity->isModified('details'));
 
-
         TypeObjectTableMap::clearInstancePool();
         $typeObjectEntity = TypeObjectQuery::create()->findOne();
 
diff --git a/tests/Propel/Tests/Runtime/TypeTests/DummyObjectClass.php b/tests/Propel/Tests/Runtime/TypeTests/DummyObjectClass.php
index e23aa8c10e..e9bcbe3dae 100644
--- a/tests/Propel/Tests/Runtime/TypeTests/DummyObjectClass.php
+++ b/tests/Propel/Tests/Runtime/TypeTests/DummyObjectClass.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Runtime\TypeTests;
 
 class DummyObjectClass
diff --git a/tests/Propel/Tests/Runtime/TypeTests/TypeObjectInterface.php b/tests/Propel/Tests/Runtime/TypeTests/TypeObjectInterface.php
index f47275f3a3..7043692608 100644
--- a/tests/Propel/Tests/Runtime/TypeTests/TypeObjectInterface.php
+++ b/tests/Propel/Tests/Runtime/TypeTests/TypeObjectInterface.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Propel\Tests\Runtime\TypeTests;
 
 interface TypeObjectInterface
diff --git a/tests/Propel/Tests/Runtime/Util/ProfilerTest.php b/tests/Propel/Tests/Runtime/Util/ProfilerTest.php
index a492b5ce35..ba66344e2f 100644
--- a/tests/Propel/Tests/Runtime/Util/ProfilerTest.php
+++ b/tests/Propel/Tests/Runtime/Util/ProfilerTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Util;
diff --git a/tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php b/tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php
index 35418c8eaa..a23ef5c915 100644
--- a/tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php
+++ b/tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Util;
@@ -18,7 +16,6 @@
  * Test class for PropelConditionalProxy.
  *
  * @author Julien Muetton <julien_muetton@carpe-hora.com>
- * @version $Id: CriteriaCombineTest.php 1347 2009-12-03 21:06:36Z francois $
  */
 class PropelConditionalProxyTest extends BaseTestCase
 {
diff --git a/tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php b/tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php
index ccd1bd2f73..a6e5880036 100644
--- a/tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php
+++ b/tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Util;
diff --git a/tests/Propel/Tests/Runtime/Util/PropelModelPagerTest.php b/tests/Propel/Tests/Runtime/Util/PropelModelPagerTest.php
index bad723a106..17e22e7964 100644
--- a/tests/Propel/Tests/Runtime/Util/PropelModelPagerTest.php
+++ b/tests/Propel/Tests/Runtime/Util/PropelModelPagerTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Util;
diff --git a/tests/Propel/Tests/Runtime/Util/TableMapExceptionsTest.php b/tests/Propel/Tests/Runtime/Util/TableMapExceptionsTest.php
index 5a97961a44..4fa80bca16 100644
--- a/tests/Propel/Tests/Runtime/Util/TableMapExceptionsTest.php
+++ b/tests/Propel/Tests/Runtime/Util/TableMapExceptionsTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Util;
diff --git a/tests/Propel/Tests/Runtime/Util/TableMapTest.php b/tests/Propel/Tests/Runtime/Util/TableMapTest.php
index 8fe75db3d1..5dda42f249 100644
--- a/tests/Propel/Tests/Runtime/Util/TableMapTest.php
+++ b/tests/Propel/Tests/Runtime/Util/TableMapTest.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests\Runtime\Util;
@@ -126,7 +124,6 @@ public function testBigIntIgnoreCaseOrderBy()
         $this->assertEquals('SortTest4', $rows[3]->getStoreName());
     }
 
-    
     /**
      * @return void
      */
diff --git a/tests/Propel/Tests/TestCase.php b/tests/Propel/Tests/TestCase.php
index 3a859c0a54..77fdfe34bf 100644
--- a/tests/Propel/Tests/TestCase.php
+++ b/tests/Propel/Tests/TestCase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
diff --git a/tests/Propel/Tests/TestCaseFixtures.php b/tests/Propel/Tests/TestCaseFixtures.php
index b741e17ba9..95c777303d 100644
--- a/tests/Propel/Tests/TestCaseFixtures.php
+++ b/tests/Propel/Tests/TestCaseFixtures.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
diff --git a/tests/Propel/Tests/TestCaseFixturesDatabase.php b/tests/Propel/Tests/TestCaseFixturesDatabase.php
index b12c5c4e8b..7f478048c5 100644
--- a/tests/Propel/Tests/TestCaseFixturesDatabase.php
+++ b/tests/Propel/Tests/TestCaseFixturesDatabase.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
@@ -18,5 +16,8 @@
  */
 class TestCaseFixturesDatabase extends TestCaseFixtures
 {
+    /**
+     * @var bool
+     */
     protected static $withDatabaseSchema = true;
 }
diff --git a/tests/Propel/Tests/Ticket520Test.php b/tests/Propel/Tests/Ticket520Test.php
index 01275562aa..f08bb934a0 100644
--- a/tests/Propel/Tests/Ticket520Test.php
+++ b/tests/Propel/Tests/Ticket520Test.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * This file is part of the Propel package.
+ * MIT License. This file is part of the Propel package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- *
- * @license MIT License
  */
 
 namespace Propel\Tests;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index faf9e67366..ae7789319b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,11 +1,13 @@
 <?php
 
-require_once __DIR__.'/../autoload.php.dist';
+require_once __DIR__ . '/../autoload.php.dist';
 
 // check if user is root and
 if (function_exists("posix_getuid")) {
-    if (posix_getuid() == 0)
-        die("You must run tests suite with an unprivileged user.");
+    if (posix_getuid() === 0) {
+        echo('You must run tests suite with an unprivileged user.');
+        die(1);
+    }
 }
 
 define('DS', DIRECTORY_SEPARATOR);