Merge

* Added PHPUnit tests
* Added Code Coverage