Added a test for a bug in the surround helper where whitespace
characters would not be stripped and 's' characters would.
Fix for a bug in the surround helper where leading and trailing
whitespace would not be stripped and 's' characters would.
Update CHANGELOG. [ci skip]