adding wrench for test cleanup
improving tests some, adding more vars and using wrench to cleanup fakes3