makes radius optional
merge resolution
Use expect syntax for stubs
Merge branch 'sylvainsf-optional-radius'