Further fixes to GrepTool and GrepToolTest