Updated uris in tests, and removed code that caused a warning.