* Added some comments
* Added more test assertions