Added unit test
Added more tests