Fix to phar test
Merge branch 'develop'