Merge "Fix Setup.php file-scope test"