Added Entities
Added tests using PHPUnit.