SOAP-1416 More generic scenarios; testing suggestions moved to comments