Edited CutToolTest and CutTool to integrate with the shell