Fixing tests for PHP 5.3