Fixed compatibility with ext/phar
Made test compatible with O+