tests fixed for PHP 5.4+