Added an extra couple of test examples to the URI parser.
Added a few more test cases.
Changed function interface, added some failing test cases.