Removed a large portion of strings for Uri. Fixed small bug in test helpers