Added test cases, extended reg-exp to meet valid URL characters