More www/www-test link replacements