* Implemented some initial tests
* Refactor