Improved generic URI tests.