Unit Tests: Make it more compatible with PHPUnit when installed as a Phar, or, Composer package, by removing a duplicate require (Phpunit already includes the file itself). Props scribu Fixes #25065


git-svn-id: https://develop.svn.wordpress.org/trunk@25145 602fd350-edb4-49c9-b593-d223f7449a82
Use a better variable name in antispambot() introduced with [25055]. Props duck_ Fixes #16754


git-svn-id: https://develop.svn.wordpress.org/trunk@25146 602fd350-edb4-49c9-b593-d223f7449a82