Added test cases for URI construction. URI construction more sane.