Updated more tests to auto-cleanup appropriately after they execute.