CRM-13252 attempt to replicate in test, Also add (passing) test on return params