Added unit tests !!