Add new delete tool, and improve some of the unit test tool.