Added tests for the surround snippet