Refactored Test Case to support url