More test fixes for PHP 5.2