Minor renaming and comment improvment
Add unit test for ZoneClipperCLI