Validate target URLs
Fix tests to match recent refactoring