will do.  I wasn't aware of addCleanup.  I think there is some cruft here from me trying to figure out why the tests were failing on Jenkins, but not locally.  I'll clean all that up.