Some changes
Merge
Some changes
Add tests
Fix error in phpunit test class
Fix error in phpunit test class
Merge branch 'phpunit-tests' into develop
Merge branch 'develop'