Fixing test for PHP 5.3
Dammit
Merge branch 'bugfix/test-fix'