Unit tests fixes for PHP 5.3