Updated tests for PHP5.3 compatibility