Adding unit tests
Cleaning up..