Rename SNIP to CLIP
Minor test output tweaks