[+FEATURE] Added some basic unit tests
[+FEATURE] Added more unit tests
Merge branch 'feature/phpunit' into develop