Update tests and fix URI parsing