Merge "Only use "*Test.php" for actual PHPUnit tests"