Added unit tests
Added unit tests