Updated for tests on PHP 5.6