ENTESB-934 polish the soap examples