Added some tests
Merge branch 'dev-phpunit'