Use Google as registered redirect
Remove some brittleness in tests