Finish fixing tests for PHP 5.4.