SOAP-2335 More readable code + unit test