improved test for surround template