Added unit test
Implement unit test