Merge branch 'hotfix/set-up-phpunit'
- Updates for travis ci
Merge branch 'hotfix/fixes-for-ci' into develop