Improve Address tests
Improve URI tests