Added unit tests
Added tests