Merge "Merge two FileTest.php files"