SOAP tests improvement

Can be reviewed.