Added unit tests
Committing unit tests