added more tests, updated Input, URI classes