* Basic test working

* Almost all tests working.

* all tests passing.

* Fixed lint.

* Improved Style.