Adds Wrench dependency.  Adds some test cleanup code.