Fixed some more tests for PHP 5.3 compatibility (for now...)