* Added isValidScheme to check for http/https.
* Added more test cases
* Cleaned up test code
Fixed merge conflicts.
Updated URI parser tests.