New test added
//TODO .. Refactoring & More functionalities