convert all test cleanup to addToCleanup

t/AdSpace/Ad.t

@@ -49,7 +49,7 @@ my $ad;
 my ($richAd, $textAd, $imageAd, $nonAd, $setAd);
 my $adSpace;
 my $imageStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($imageStorage);
+WebGUI::Test->addToCleanup($imageStorage);
 $imageStorage->addFileFromScalar('foo.bmp', 'This is not really an image');
 
 SKIP: {

t/Asset/AssetClipboard.t

@@ -29,7 +29,7 @@ $session->user({userId => 3});
 my $root = WebGUI::Asset->getRoot($session);
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Asset Clipboard test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my $snippet = $root->addChild({
     url => 'testSnippet',
@@ -86,7 +86,7 @@ is($duplicatedSnippet->getParent->getId, $root->getId, 'duplicated snippet is al
 
 my $newVersionTag = WebGUI::VersionTag->getWorking($session);
 $newVersionTag->commit;
-WebGUI::Test->tagsToRollback($newVersionTag);
+WebGUI::Test->addToCleanup($newVersionTag);
 
 ####################################################
 #

t/Asset/AssetExportHtml.t

@@ -293,7 +293,7 @@ is($gcAsPath->absolute($exportPath)->stringify, $litmus->absolute($exportPath)->
 
 # now let's get tricky and test different file extensions
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage->getId);
+WebGUI::Test->addToCleanup($storage->getId);
 my $filename = 'somePerlFile_pl.txt';
 $storage->addFileFromScalar($filename, $filename);
 $session->user({userId=>3});
@@ -326,7 +326,7 @@ is($fileAsPath->absolute($exportPath)->stringify, $litmus->absolute($exportPath)
 
 # test a different extension, the .foobar extension
 $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage->getId);
+WebGUI::Test->addToCleanup($storage);
 $filename = 'someFoobarFile.foobar';
 $storage->addFileFromScalar($filename, $filename);
 $properties = {

t/Asset/AssetLineage.t

@@ -32,7 +32,7 @@ is($asset->formatRank(76), "000076", "formatRank()");
 is($asset->getLineageLength(), (length($asset->get("lineage")) / 6), "getLineageLength()");
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set({name=>"AssetLineage Test"});
 
 my $root = WebGUI::Asset->getRoot($session);
@@ -60,7 +60,7 @@ my $folder2 = $topFolder->addChild({
 });
 
 my $editor = WebGUI::User->new($session, 'new');
-WebGUI::Test->usersToDelete($editor);
+WebGUI::Test->addToCleanup($editor);
 $editor->addToGroups([4]);
 
 my @snippets = ();
@@ -517,7 +517,7 @@ ok(!exists $session->stow->get('assetLineage')->{assetLineage}, '... no entry fo
 
 my $vTag2 = WebGUI::VersionTag->getWorking($session);
 $vTag2->set({name=>"deep addChild test"});
-WebGUI::Test->tagsToRollback($vTag2);
+WebGUI::Test->addToCleanup($vTag2);
 
 WebGUI::Test->interceptLogging();
 

t/Asset/AssetPackage.t

@@ -32,7 +32,7 @@ my $root = WebGUI::Asset->getRoot($session);
 is(scalar @{ $root->getPackageList }, 0, 'WebGUI does not ship with packages');
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set({name=>"Asset Package test"});
 
 my $time = time() -2;
@@ -88,7 +88,7 @@ cmp_ok( $snippetRev->get('revisionDate'), '>', $snippet->get('revisionDate'), '.
 
 my $vt2 = WebGUI::VersionTag->getWorking($session);
 $vt2->commit;
-WebGUI::Test->tagsToRollback($vt2);
+WebGUI::Test->addToCleanup($vt2);
 
 $targetFolder->www_deployPackage();
 
@@ -109,7 +109,7 @@ isa_ok($deployedFolderChildren->[0] , 'WebGUI::Asset::Snippet', 'deployed child
 $folder->addRevision({isPackage => 0});
 
 my $newVersionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($newVersionTag);
+WebGUI::Test->addToCleanup($newVersionTag);
 $newVersionTag->commit;
 
 my $newFolder = WebGUI::Asset->newById($session, $folder->getId);
@@ -125,7 +125,7 @@ is($updatedSnippet->get('snippet'), 'Always upgrade to the latest version', 'imp
 cmp_ok( $updatedSnippet->get('revisionDate'), '>', $snippetRev->get('revisionDate'), '... revisionDate check on imported package with overwriteLatest');
 
 my $lastTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($lastTag);
+WebGUI::Test->addToCleanup($lastTag);
 
 TODO: {
     local $TODO = "Tests to make later";

t/Asset/AssetTrash.t

@@ -26,7 +26,7 @@ my $session = WebGUI::Test->session;
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"AssetLineage Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my $root = WebGUI::Asset->getRoot($session);
 my $topFolder = $root->addChild({

t/Asset/AssetVersion.t

@@ -87,12 +87,12 @@ is($versionTagCheck, $originalVersionTags, 'version tag cleaned up by deleting l
 $snippet = $root->addChild($propertyHash);
 my $tag1 = WebGUI::VersionTag->getWorking($session);
 $tag1->commit;
-WebGUI::Test->tagsToRollback($tag1);
+WebGUI::Test->addToCleanup($tag1);
 sleep 1;
 $snippetv2 = $snippet->addRevision({snippet => 'Vie gates.  Ich bin ein snippetr.'});
 my $tag2 = WebGUI::VersionTag->getWorking($session);
 $tag2->commit;
-WebGUI::Test->tagsToRollback($tag2);
+WebGUI::Test->addToCleanup($tag2);
 note "purge";
 checkTableEntries($snippetv2->getId, 1,2,2);
 $versionTagCheck = $session->db->quickScalar(q{select count(*) from assetVersionTag});

t/Asset/EMSSubmissionForm.t

@@ -58,9 +58,9 @@ $submitGroupA->addUsers([$userA->userId,$userC->userId]);
 $submitGroupB->addUsers([$userB->userId,$userC->userId]);
 $attendees->addUsers([$userA->getId, $userB->getId, $userC->getId]);
 
-WebGUI::Test->groupsToDelete($submitGroupA,$submitGroupB);
+WebGUI::Test->addToCleanup($submitGroupA,$submitGroupB);
-WebGUI::Test->groupsToDelete($registrars, $attendees);
+WebGUI::Test->addToCleanup($registrars, $attendees);
-WebGUI::Test->usersToDelete($userA,$userB,$userC,$registrar);
+WebGUI::Test->addToCleanup($userA,$userB,$userC,$registrar);
 
 sub loginAdmin { $session->user({userId => 3}); }
 sub loginRgstr { $session->user({userId => $registrar->userId}); }
@@ -77,7 +77,7 @@ loginAdmin;
 # Create a version tag to work in
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"EventManagementSystem Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 # Do our work in the import node
 my $node = WebGUI::Asset->getImportNode($session);
@@ -121,7 +121,7 @@ my $i18n = $ems->i18n;
 
 $versionTag->commit;
 $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $ems = $ems->cloneFromDb;
 
 my $id1 = $ems->getNextSubmissionId;
@@ -211,7 +211,7 @@ my $submission = {
         };
 $session->request->setup_body($submission);
 my $sub1 = $frmA->addSubmission;
-WebGUI::Test->assetsToPurge( $sub1 );
+WebGUI::Test->addToCleanup( $sub1 );
 print join( "\n", @{$sub1->{errors}} ),"\n" if defined $sub1->{errors};
 my $isa1 = isa_ok( $sub1, 'WebGUI::Asset::EMSSubmission', "userA/formA valid submission succeeded" );
 ok( $ems->hasSubmissions, 'UserA has submissions on this ems' );
@@ -229,7 +229,7 @@ $submission = {
         };
 $session->request->setup_body($submission);
 my $sub2 = $frmB->addSubmission;
-WebGUI::Test->assetsToPurge( $sub2 );
+WebGUI::Test->addToCleanup( $sub2 );
 my $isa2 = isa_ok( $sub2, 'WebGUI::Asset::EMSSubmission', "userB/FormB valid submission succeeded" );
 
 loginUserC;
@@ -355,7 +355,7 @@ $sub1 = $sub1->cloneFromDb;
 is( $sub1->get('submissionStatus'),'created','approval successfull');
 
 my $ticket = WebGUI::Asset->newById($session, $sub1->get('ticketId'));
-WebGUI::Test->assetsToPurge( $ticket ) if $ticket ;
+WebGUI::Test->addToCleanup( $ticket ) if $ticket ;
 SKIP: {
 skip 'no ticket created', 1 unless isa_ok( $ticket, 'WebGUI::Asset::Sku::EMSTicket', 'approval created a ticket');
 is( $ticket->get('title'), $sub1->get('title'), 'Ticket title matches submission title' );

t/Asset/Event.t

@@ -25,7 +25,7 @@ my $session = WebGUI::Test->session;
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Adding Calendar for Event Asset Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $defaultAsset = WebGUI::Asset->getDefault($session);
 my $cal = $defaultAsset->addChild({className=>'WebGUI::Asset::Wobject::Calendar'});
 $versionTag->commit;
@@ -119,7 +119,7 @@ $properties3->{url}       = 'event-asset-test6';
 $properties3->{className} = 'WebGUI::Asset::Event';
 
 my $eventStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($eventStorage);
+WebGUI::Test->addToCleanup($eventStorage);
 $properties3->{storageId} = $eventStorage->getId;
 
 my $event6 = $cal->addChild($properties3, $properties3->{id});
@@ -130,7 +130,7 @@ my $event6a = $event6->addRevision({ title => 'Event with storage', }, undef, {
 ok($session->id->valid($event6a->get('storageId')), 'addRevision gives the new revision a valid storageId');
 isnt($event6a->get('storageId'), $event6->get('storageId'), '... and it is different from the previous revision');
 my $versionTag2 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag2);
+WebGUI::Test->addToCleanup($versionTag2);
 $versionTag2->commit;
 
 my $event7 = $cal->addChild(

t/Asset/Event/edit.t

@@ -37,7 +37,7 @@ $session->setting->set( 'defaultVersionTagWorkflow', 'pbworkflow000000000003' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );

t/Asset/Event/permissions.t

@@ -33,7 +33,7 @@ push @versionTags, WebGUI::VersionTag->getWorking($session);
 $versionTags[-1]->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
 
 my $registeredUser  = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($registeredUser);
+WebGUI::Test->addToCleanup($registeredUser);
 
 # Make a Calendar to add events do
 my $calendar = $node->addChild({

t/Asset/File/GalleryFile/Photo/edit.t

@@ -35,7 +35,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );

t/Asset/File/GalleryFile/Photo/permissions.t

@@ -29,16 +29,16 @@ my $maker           = WebGUI::Test::Maker::Permission->new;
 $session->user({ userId => 3 });
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 # Add a new user to the test user's friends list
 my $friend  = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($friend);
+WebGUI::Test->addToCleanup($friend);
 WebGUI::Friends->new($session)->add( [ $friend->userId ] );
 
 # Add a new registered user
 my $notFriend   = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($notFriend);
+WebGUI::Test->addToCleanup($notFriend);
 
 my $gallery
     = $node->addChild({

t/Asset/Post.t

@@ -54,7 +54,7 @@ my $otherUser           = WebGUI::User->new($session, 'new');
 my $groupIdEditUser     = WebGUI::User->new($session, 'new');
 my $groupToEditPostId   = $collab->get('groupToEditPost');
 my $groupIdEdit         = $collab->get('groupIdEdit');
-WebGUI::Test->usersToDelete($postingUser, $otherUser, $groupIdEditUser);
+WebGUI::Test->addToCleanup($postingUser, $otherUser, $groupIdEditUser);
 $postingUser->username('userForPosting');
 $otherUser->username('otherUser');
 
@@ -83,7 +83,7 @@ my $props = {
 my $post = $collab->addChild($props, @addArgs);
 
 $versionTag->commit();
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $post = $post->cloneFromDb;
 
 # Test for a sane object type
@@ -148,7 +148,7 @@ my $post2 = $collab->addChild({
     ownerUserId => 1,
 }, @addArgs);
 $versionTag2->commit();
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $variables;
 $session->user({userId => 1});
 $variables = $post1->getTemplateVars();

t/Asset/Post/Thread/permission.t

@@ -30,11 +30,11 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 $user{"2"}->addToGroups( ['2'] ); # Registered user
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set( { name => "Collaboration Test" } );
 
 my @addArgs = ( undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 } );

t/Asset/Post/permission.t

@@ -30,12 +30,12 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 $user{"2"}->addToGroups( ['2'] ); # Registered user
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
 $versionTag->set( { name => "Collaboration Test" } );
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my @addArgs = ( undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 } );
 

t/Asset/Redirect/mech.t

@@ -37,7 +37,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );

t/Asset/Shortcut/010-linked-asset.t

@@ -148,7 +148,7 @@ ok(
 sub init {
     my $versionTag      = WebGUI::VersionTag->getWorking($session);
     $versionTag->set({name=>"Shortcut Test"});
-    WebGUI::Test->tagsToRollback($versionTag);
+    WebGUI::Test->addToCleanup($versionTag);
     # Make a snippet to shortcut
     $snippet 
         = $node->addChild({

t/Asset/Sku/Product.t

@@ -57,7 +57,7 @@ foreach my $file_property (qw/image1 image2 image3 brochure manual warranty/) {
 }
 
 my $image = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($image);
+WebGUI::Test->addToCleanup($image);
 $image->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('lamp.jpg'));
 $image->generateThumbnail('lamp.jpg');
 
@@ -72,7 +72,7 @@ ok($imagedProduct->getThumbnailUrl(), 'getThumbnailUrl is not empty');
 is($imagedProduct->getThumbnailUrl(), $image->getThumbnailUrl('lamp.jpg'), 'getThumbnailUrl returns the right path to the URL');
 
 my $otherImage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($otherImage);
+WebGUI::Test->addToCleanup($otherImage);
 $otherImage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('gooey.jpg'));
 $otherImage->generateThumbnail('gooey.jpg');
 
@@ -118,7 +118,7 @@ cmp_deeply(
 
 my $tag = WebGUI::VersionTag->getWorking($session);
 $tag->commit;
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 
 ####################################################
 #
@@ -132,7 +132,7 @@ my $newImagedProduct = $imagedProduct->addRevision({title => 'Bible and hammer'}
 like($newImagedProduct->get('image1'), $session->id->getValidator, 'addRevision: new product rev got an image1 storage location');
 isnt($newImagedProduct->get('image1'), $imagedProduct->get('image1'), '... and it is not the same as the old one');
 
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));
 WebGUI::VersionTag->getWorking($session)->commit;
 
 ####################################################
@@ -169,7 +169,7 @@ my $viewProduct = $node->addChild({
 
 my $tag2 = WebGUI::VersionTag->getWorking($session);
 $tag2->commit;
-WebGUI::Test->tagsToRollback($tag2);
+WebGUI::Test->addToCleanup($tag2);
 
 ##Fetch a copy from the db, just like a page fetch
 $viewProduct = WebGUI::Asset->newById($session, $viewProduct->getId);

t/Asset/Sku/Subscription.t

@@ -37,9 +37,9 @@ plan tests => 4;        # Increment this number for each test you create
 # put your tests here
 my $root  = WebGUI::Asset->getRoot($session);
 my $group = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($group);
+WebGUI::Test->addToCleanup($group);
 my $user  = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 
 my $sku = $root->addChild({
         className => "WebGUI::Asset::Sku::Subscription",
@@ -50,7 +50,7 @@ my $sku = $root->addChild({
         duration              => 'Monthly',
         });
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 isa_ok($sku, "WebGUI::Asset::Sku::Subscription");
 
 is($sku->getPrice, 50.00, "Price should be 50.00");

t/Asset/Story.t

@@ -39,8 +39,8 @@ my $reader       = WebGUI::User->create($session);
 $postUser->username('Can Post User');
 $reader->username('Average Reader');
 $archiveOwner->username('Archive Owner');
-WebGUI::Test->groupsToDelete($canPostGroup);
+WebGUI::Test->addToCleanup($canPostGroup);
-WebGUI::Test->usersToDelete($postUser, $archiveOwner, $reader);
+WebGUI::Test->addToCleanup($postUser, $archiveOwner, $reader);
 
 my $canEditMaker = WebGUI::Test::Maker::Permission->new();
 $canEditMaker->prepare({
@@ -70,11 +70,11 @@ my $topic       = $defaultNode->addChild({
 });
 my $archiveTag  = WebGUI::VersionTag->getWorking($session);
 $archiveTag->commit;
-WebGUI::Test->tagsToRollback($archiveTag);
+WebGUI::Test->addToCleanup($archiveTag);
 
 my $storage1 = WebGUI::Storage->create($session);
 my $storage2 = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage1, $storage2);
+WebGUI::Test->addToCleanup($storage1, $storage2);
 
 ############################################################
 #
@@ -412,7 +412,7 @@ cmp_deeply(
 isnt($newPhotoData->[0]->{storageId}, $photoData->[0]->{storageId}, '... and storage 0 is duplicated');
 isnt($newPhotoData->[1]->{storageId}, $photoData->[1]->{storageId}, '... and storage 1 is duplicated');
 
-WebGUI::Test->storagesToDelete( map { $_->{storageId} } @{ $newPhotoData } );
+WebGUI::Test->addToCleanup( map { 'WebGUI::Storage' => $_->{storageId} } @{ $newPhotoData } );
 
 ############################################################
 #

t/Asset/Template.t

@@ -178,5 +178,5 @@ like($logError, qr/$brokenUrl/, 'process: logged error has the url');
 like($logError, qr/$brokenId/, '... and the template id');
 WebGUI::Test->restoreLogging;
 
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));
 

t/Asset/Template/packed.t

@@ -36,7 +36,7 @@ my $templates       = WebGUI::Asset->getRoot( $session )
                     ->getLineage( ['descendants'], { 
                         includeOnlyClasses => [ 'WebGUI::Asset::Template' ],
                     } );
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/WikiPage.t

@@ -53,7 +53,7 @@ is($article, undef, "Can't add an Article wobject as a child to a Wiki Page.");
 my $wikiPageCopy = $wikipage->duplicate();
 isa_ok($wikiPageCopy, 'WebGUI::Asset::WikiPage');
 my $thirdVersionTag = WebGUI::VersionTag->new($session,$wikiPageCopy->get("tagId"));
-WebGUI::Test->tagsToRollback($thirdVersionTag);
+WebGUI::Test->addToCleanup($thirdVersionTag);
 
 ## isProtected
 

t/Asset/WikiPage/subscribable.t

@@ -36,7 +36,7 @@ my $page
         className               => 'WebGUI::Asset::WikiPage',
     }, undef, undef, { skipAutoCommitWorkflows => 1 } );
 
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/Article.t

@@ -40,7 +40,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Article Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
 
 # Test for a sane object type
@@ -71,7 +71,7 @@ my $pathedFile = WebGUI::Test->getTestCollateralPath($filename);
 
 # Use some test collateral to create a storage location and assign it to our article
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 my $storedFilename = $storage->addFileFromFilesystem($pathedFile);
 my $filenameOK = is ($storedFilename, $filename, 'storage created correctly');
 

t/Asset/Wobject/Collaboration/permission.t

@@ -31,7 +31,7 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
 $user{"2"}->addToGroups( ['2'] ); # Registered user
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
 $versionTag->set( { name => "Collaboration Test" } );

t/Asset/Wobject/Collaboration/unarchiveAll.t

@@ -40,7 +40,7 @@ my @threads = (
 
 my $tag = WebGUI::VersionTag->getWorking( $session );
 $tag->commit;
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/DataForm.t

@@ -43,7 +43,7 @@ my $dform = WebGUI::Asset->getDefault($session)->addChild({
 $dform->createField('gotCaptcha', { type => 'Captcha', name => 'humanCheck', });
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->commit;
 
 #----------------------------------------------------------------------------

t/Asset/Wobject/EventManagementSystem.t

@@ -32,10 +32,10 @@ my $session         = WebGUI::Test->session;
 my $registrar = WebGUI::User->create($session);
 my $attender  = WebGUI::User->create($session);
 my $crasher   = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($registrar, $attender, $crasher);
+WebGUI::Test->addToCleanup($registrar, $attender, $crasher);
 my $registrars = WebGUI::Group->new($session, 'new');
 my $attendees  = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($registrars, $attendees);
+WebGUI::Test->addToCleanup($registrars, $attendees);
 $registrars->addUsers([$registrar->getId]);
 $attendees->addUsers([$attender->getId]);
 
@@ -71,7 +71,7 @@ my $ems = $node->addChild({
     groupIdView              => $attendees->getId
 });
 $versionTag->commit;
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 # Test for a sane object type
 isa_ok($ems, 'WebGUI::Asset::Wobject::EventManagementSystem');

t/Asset/Wobject/Gallery/permission.t

@@ -25,12 +25,12 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Gallery Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $maker           = WebGUI::Test::Maker::Permission->new;
 my $gallery;
 
 my $nonAdmin    = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($nonAdmin);
+WebGUI::Test->addToCleanup($nonAdmin);
 
 
 #----------------------------------------------------------------------------

t/Asset/Wobject/GalleryAlbum/ajax.t

@@ -28,9 +28,9 @@ my $versionTag      = WebGUI::VersionTag->getWorking($session);
 my %user;
 $user{'1'} = WebGUI::User->new( $session, "new" );
 $user{'1'}->addToGroups( ['3'] ); # Admins
-WebGUI::Test->usersToDelete($user{'1'});
+WebGUI::Test->addToCleanup($user{'1'});
 $user{'2'} = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 
 # Create everything as user no. 1
 $session->user({ user => $user{'1'} });

t/Asset/Wobject/GalleryAlbum/edit.t

@@ -36,7 +36,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
@@ -59,7 +59,7 @@ my $gallery
     } );
 
 $versionTags[-1]->commit;
-WebGUI::Test->tagsToRollback(@versionTags);
+WebGUI::Test->addToCleanup(@versionTags);
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/GalleryAlbum/permission.t

@@ -28,7 +28,7 @@ my $node            = WebGUI::Asset->getImportNode($session);
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
 $user{"2"}->addToGroups( ['2'] ); # Registered user
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Album Test"});

t/Asset/Wobject/GalleryAlbum/rss.t

@@ -28,7 +28,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Album Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $gallery
     = $node->addChild({
         className           => "WebGUI::Asset::Wobject::Gallery",

t/Asset/Wobject/InOutBoard.t

@@ -44,14 +44,14 @@ foreach my $name (@names) {
     $user->username($name);
     push @users, $user;
 }
-WebGUI::Test->usersToDelete(@users);
+WebGUI::Test->addToCleanup(@users);
 
 # Do our work in the import node
 my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"InOutBoard Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $board = $node->addChild({
     className       => 'WebGUI::Asset::Wobject::InOutBoard',
     inOutTemplateId => $templateId,

t/Asset/Wobject/Matrix.t

@@ -29,7 +29,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Matrix Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $matrix = $node->addChild({className=>'WebGUI::Asset::Wobject::Matrix'});
 
 # Test for a sane object type
@@ -108,7 +108,7 @@ my $matrixListing = $matrix->addChild({className=>'WebGUI::Asset::MatrixListing'
 
 my $secondVersionTag = WebGUI::VersionTag->new($session,$matrixListing->get("tagId"));
 $secondVersionTag->commit;
-WebGUI::Test->tagsToRollback($secondVersionTag);
+WebGUI::Test->addToCleanup($secondVersionTag);
 $matrixListing = $matrixListing->cloneFromDb;
 
 # Test for sane object type

t/Asset/Wobject/Poll.t

@@ -77,7 +77,7 @@ my $poll = $defaultNode->addChild({
 });
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->commit;
 
 isa_ok($poll, 'WebGUI::Asset::Wobject::Poll');

t/Asset/Wobject/Shelf.t

@@ -447,7 +447,7 @@ SKIP: {
     ##Clear out this tag so we can do downstream work.
     my $tag = WebGUI::VersionTag->getWorking($session);
     $tag->commit;
-    WebGUI::Test->tagsToRollback($tag);
+    WebGUI::Test->addToCleanup($tag);
 
     #######################################################################
     #
@@ -457,9 +457,9 @@ SKIP: {
 
     my $tommy  = WebGUI::User->create($session);
     my $warden = WebGUI::User->create($session);
-    WebGUI::Test->usersToDelete($tommy, $warden);
+    WebGUI::Test->addToCleanup($tommy, $warden);
     my $inGroup = WebGUI::Group->new($session, 'new');
-    WebGUI::Test->groupsToDelete($inGroup);
+    WebGUI::Test->addToCleanup($inGroup);
     $inGroup->addUsers([$tommy->getId]);
 
     my $testTemplate = $root->addChild({
@@ -471,7 +471,7 @@ SKIP: {
         templateId => $testTemplate->getId,
     });
     my $tag2 = WebGUI::VersionTag->getWorking($session);
-    WebGUI::Test->tagsToRollback($tag2);
+    WebGUI::Test->addToCleanup($tag2);
     $tag2->commit;
     $session->user({userId => 1});
     $testShelf->prepareView;
@@ -486,7 +486,7 @@ SKIP: {
         title       => 'Private Product',
     });
     my $tag3 = WebGUI::VersionTag->getWorking($session);
-    WebGUI::Test->tagsToRollback($tag3);
+    WebGUI::Test->addToCleanup($tag3);
     $tag3->commit;
 
     $session->user({user => $tommy});

t/Asset/Wobject/StoryArchive.t

@@ -40,7 +40,7 @@ use DateTime;
 my $session         = WebGUI::Test->session;
 
 my $staff = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($staff);
+WebGUI::Test->addToCleanup($staff);
 $staff->name('Reporting Staff');
 
 my $reporter = WebGUI::User->new($session, 'new');
@@ -50,7 +50,7 @@ $editor->username('editor');
 my $reader   = WebGUI::User->new($session, 'new');
 $reader->username('reader');
 $staff->addUsers([$reporter->userId]);
-WebGUI::Test->usersToDelete($reporter, $editor, $reader);
+WebGUI::Test->addToCleanup($reporter, $editor, $reader);
 
 my $archive = 'placeholder for Test::Maker::Permission';
 
@@ -84,7 +84,7 @@ $archive    = $home->addChild({
               });
 $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->commit;
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 $archive = $archive->cloneFromDb;
 
@@ -164,7 +164,7 @@ $child->purge;
 $child = $archive->addChild({className => 'WebGUI::Asset::Story', title => 'First Story'}, @skipAutoCommit);
 my $tag1 = WebGUI::VersionTag->getWorking($session);
 $tag1->commit;
-WebGUI::Test->tagsToRollback($tag1);
+WebGUI::Test->addToCleanup($tag1);
 isa_ok($child, 'WebGUI::Asset::Story', 'addChild added and returned a Story');
 is($archive->getChildCount, 1, '... added it to the archive');
 my $folder = $archive->getFirstChild();
@@ -202,7 +202,7 @@ my $story = $oldFolder->addChild({ className => 'WebGUI::Asset::Story', title =>
 $creationDateSth->execute([$wgBday, $story->getId]);
 my $tag2 = WebGUI::VersionTag->getWorking($session);
 $tag2->commit;
-WebGUI::Test->tagsToRollback($tag2);
+WebGUI::Test->addToCleanup($tag2);
 
 {
     my $storyDB = WebGUI::Asset->newByUrl($session, $story->getUrl);
@@ -213,7 +213,7 @@ my $pastStory = $newFolder->addChild({ className => 'WebGUI::Asset::Story', titl
 $creationDateSth->execute([$yesterday, $pastStory->getId]);
 my $tag3 = WebGUI::VersionTag->getWorking($session);
 $tag3->commit;
-WebGUI::Test->tagsToRollback($tag3);
+WebGUI::Test->addToCleanup($tag3);
 
 my $templateVars;
 $templateVars = $archive->viewTemplateVariables();
@@ -289,7 +289,7 @@ foreach my $storilet ($story2, $story3, $story4) {
 $archive->update({storiesPerPage => 3});
 my $tag4 = WebGUI::VersionTag->getWorking($session);
 $tag4->commit;
-WebGUI::Test->tagsToRollback($tag4);
+WebGUI::Test->addToCleanup($tag4);
 
 ##Don't assume that Admin and Visitor have the same timezone.
 $session->user({userId => 3});
@@ -571,7 +571,7 @@ cmp_deeply(
 ################################################################
 
 my $exportStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($exportStorage);
+WebGUI::Test->addToCleanup($exportStorage);
 my $basedir = Path::Class::Dir->new($exportStorage->getPath);
 $exportStorage->addFileFromScalar('index', 'export story archive content');
 my $assetDir  = $basedir->subdir('mystories');

t/Asset/Wobject/StoryTopic.t

@@ -189,7 +189,7 @@ is($templateVars->{topStoryCreationDate}, $now, '... topStoryCreationDate');
 ok($templateVars->{standAlone}, '... standAlone mode=1');
 
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 $storyHandler->{bogs}->setPhotoData([{
     caption   => "Octopus seen at the scene of Mrs. Dufresne's murder.",
     byLine    => 'Elmo Blatch',

t/Asset/Wobject/Survey.t

@@ -26,7 +26,7 @@ plan tests => 47;
 my ($survey);
 
 my $user = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
 # Create a Survey
@@ -119,7 +119,7 @@ ok($survey->responseId, '..(and similarly for responseId)');
 $survey->update({maxResponsesPerUser => 1});
 is($survey->takenCount( { userId => 1 } ), 0, 'Visitor has no responses');
 my $u = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($u);
+WebGUI::Test->addToCleanup($u);
 is($survey->takenCount( { userId => $u->userId } ), 0, 'New user has no responses');
 delete $survey->{canTake};
 delete $survey->{responseId};
@@ -240,7 +240,7 @@ cmp_deeply(from_json($surveyEnd), { type => 'forward', url => '/getting_started'
 
     # Create another response (this one will use the new revision)
     my $newUser = WebGUI::User->new( $session, 'new' );
-    WebGUI::Test->usersToDelete($newUser);
+    WebGUI::Test->addToCleanup($newUser);
     $session->user({ user => $newUser });
     my $newResponseId = $survey->responseId;
     is($newerSurvey->responseJSON->nextResponseSection()->{text}, 'newer text', 'New response uses the new text');

t/Asset/Wobject/Survey/ExpressionEngine.t

@@ -188,7 +188,7 @@ SKIP: {
 
     # Create a test user
     $user = WebGUI::User->new( $session, 'new' );
-    WebGUI::Test->usersToDelete($user);
+    WebGUI::Test->addToCleanup($user);
     
     # Create a Survey
     $versionTag = WebGUI::VersionTag->getWorking($session);
@@ -244,7 +244,7 @@ SKIP: {
         # Create a second test user
         my $survey2 = WebGUI::Asset::Wobject::Survey->new($session, $survey->getId);
         my $user2 = WebGUI::User->new( $session, 'new' );
-        WebGUI::Test->usersToDelete($user2);
+        WebGUI::Test->addToCleanup($user2);
         $session->user({userId => $user2->userId});
         my $responseId2 = $survey2->responseId( { userId => $user2->userId } );
         my $rJSON2 = $survey2->responseJSON(undef, $responseId2);

t/Asset/Wobject/Survey/Reports.t

@@ -35,7 +35,7 @@ SKIP: {
 
 skip $tests, "Unable to load Survey" unless $usedOk;
 my $user = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
 # Create a Survey

t/Asset/Wobject/Survey/Test.t

@@ -37,7 +37,7 @@ skip "Unable to load TAP::Parser and TAP::Parser::Aggregator", 88 unless $tp &&
 use_ok('WebGUI::Asset::Wobject::Survey::Test');
 
 my $user = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
 WebGUI::Test->originalConfig('enableSurveyExpressionEngine');

t/Asset/Wobject/Thingy.t

@@ -36,7 +36,7 @@ $templateMock->mock('process', sub { $templateVars = $_[1]; } );
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Thingy Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $thingy = $node->addChild({className=>'WebGUI::Asset::Wobject::Thingy'});
 
 # Test for a sane object type
@@ -385,7 +385,7 @@ is($table, undef, '... drops thing specific table');
     $thingy->editThingDataSave($newThingId, 'new', {"field_".$newFieldId => 'value 3'} );
 
     my $andy = WebGUI::User->create($session);
-    WebGUI::Test->usersToDelete($andy);
+    WebGUI::Test->addToCleanup($andy);
     $session->user({userId => $andy->userId});
 
     my $form = $thingy->getFormPlugin({

t/Asset/Wobject/WikiMaster/featured.t

@@ -44,7 +44,7 @@ my $featuredPage
         content         => 'A how-to book',
     }, undef, undef, { skipAutoCommitWorkflows => 1 } );
 
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/WikiMaster/subscribable.t

@@ -32,7 +32,7 @@ my $wiki
         groupIdView             => '7', # Everyone
     } );
 
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/permissions.t

@@ -59,15 +59,15 @@ $testGroups{'canEdit asset'}     = WebGUI::Group->new($session, 'new');
 $testUsers{'canEdit group user'} = WebGUI::User->new($session, 'new');
 $testUsers{'canEdit group user'}->addToGroups([$testGroups{'canEdit asset'}->getId]);
 $testUsers{'canEdit group user'}->username('Edit Group User');
-WebGUI::Test->groupsToDelete($testGroups{'canEdit asset'});
+WebGUI::Test->addToCleanup($testGroups{'canEdit asset'});
 
 ##A group and user for groupIdEdit
 $testGroups{'canAdd asset'}     = WebGUI::Group->new($session, 'new');
 $testUsers{'canAdd group user'} = WebGUI::User->new($session, 'new');
 $testUsers{'canAdd group user'}->addToGroups([$testGroups{'canAdd asset'}->getId]);
 $testUsers{'canEdit group user'}->username('Can Add Group User');
-WebGUI::Test->groupsToDelete($testGroups{'canAdd asset'});
+WebGUI::Test->addToCleanup($testGroups{'canAdd asset'});
-WebGUI::Test->usersToDelete(values %testUsers);
+WebGUI::Test->addToCleanup(values %testUsers);
 
 my $canAddMaker = WebGUI::Test::Maker::Permission->new();
 $canAddMaker->prepare({
@@ -100,7 +100,7 @@ $properties = {
 };
 
 my $versionTag2 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag2);
+WebGUI::Test->addToCleanup($versionTag2);
 
 my $canEditAsset = $rootAsset->addChild($properties, $properties->{id});
 
@@ -116,7 +116,7 @@ $canEditMaker->prepare({
 });
 
 my $versionTag3 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag3);
+WebGUI::Test->addToCleanup($versionTag3);
 $properties = {
 	#            '1234567890123456789012'
 	id          => 'canViewAsset0000000010',

t/AssetAspect/RssFeed.t

@@ -153,7 +153,7 @@ cmp_deeply(
 #####################################################
 
 my $exportStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($exportStorage);
+WebGUI::Test->addToCleanup($exportStorage);
 my $basedir = Path::Class::Dir->new($exportStorage->getPath);
 my $assetdir = $basedir->subdir('shawshank');
 my $indexfile = $assetdir->file('index.html');
@@ -171,7 +171,7 @@ cmp_bag(
 );
 
 $exportStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($exportStorage);
+WebGUI::Test->addToCleanup($exportStorage);
 $basedir   = Path::Class::Dir->new($exportStorage->getPath);
 my $assetfile = $basedir->file('shawshank.html');
 $dummy->exportAssetCollateral($assetfile, {}, $session);

t/Auth/mech.t

@@ -44,7 +44,7 @@ $session->setting->set( 'specialState', '' );
 my $USERNAME    = 'dufresne';
 my $IDENTIFIER  = 'ritahayworth';
 my $user        = WebGUI::User->new( $session, "new", "something new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( $USERNAME );
 $user->addToGroups( ['3'] );
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
@@ -70,7 +70,7 @@ my $asset
     });
 $versionTags[-1]->commit;
 my $assetUrl    = $baseUrl . $asset->get('url');
-WebGUI::Test->tagsToRollback(@versionTags);
+WebGUI::Test->addToCleanup(@versionTags);
 
 #----------------------------------------------------------------------------
 # Tests

t/FilePump/Bundle.t

@@ -273,12 +273,12 @@ my $fileAsset = $root->addChild({
 $fileAsset->getStorageLocation->addFileFromScalar('pumpfile', 'Pump up the jam');
 
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 $storage->addFileFromScalar('addendum', 'Red was too');
 $storage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('ShawshankRedemptionMoviePoster.jpg'));
 
 my $snippetTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($snippetTag);
+WebGUI::Test->addToCleanup($snippetTag);
 $snippetTag->commit;
 
 my $guts;

t/Group.t

@@ -231,7 +231,7 @@ my $gB = WebGUI::Group->new($session, "new");
 $gA->name('Group A');
 $gB->name('Group B');
 ok( ($gA->name eq 'Group A' and $gB->name eq 'Group B'), 'object name assignment, multiple objects');
-WebGUI::Test->groupsToDelete($gA, $gB);
+WebGUI::Test->addToCleanup($gA, $gB);
 
 $gB->addGroups([$gA->getId]);
 
@@ -252,7 +252,7 @@ cmp_bag($gA->getGroupsIn(), [3], 'Not allowed to add myself to my group');
 my $gC = WebGUI::Group->new($session, "new");
 $gC->name('Group C');
 $gA->addGroups([$gC->getId]);
-WebGUI::Test->groupsToDelete($gC);
+WebGUI::Test->addToCleanup($gC);
 
 cmp_bag($gC->getGroupsFor(), [$gA->getId], 'Group A contains Group C');
 cmp_bag($gA->getGroupsIn(),  [$gC->getId, 3], 'Group C is a member of Group A, cached');
@@ -279,7 +279,7 @@ my $gZ = WebGUI::Group->new($session, "new");
 $gX->name('Group X');
 $gY->name('Group Y');
 $gZ->name('Group Z');
-WebGUI::Test->groupsToDelete($gX, $gY, $gZ);
+WebGUI::Test->addToCleanup($gX, $gY, $gZ);
 
 $gZ->addGroups([$gX->getId, $gY->getId]);
 
@@ -305,7 +305,7 @@ cmp_bag($gY->getAllGroupsFor(), [ map {$_->getId} ($gZ, $gA, $gB) ], 'getAllGrou
 cmp_bag($gZ->getAllGroupsFor(), [ map {$_->getId} ($gA, $gB) ], 'getAllGroupsFor Z');
 
 my $user = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $gX->userIsAdmin($user->userId, "yes");
 ok(!$gX->userIsAdmin($user->userId), "userIsAdmin: User who isn't secondary admin can't be group admin");
 isnt($gX->userIsAdmin($user->userId), 'yes', "userIsAdmin returns 1 or 0, not value");
@@ -364,13 +364,13 @@ $user->delete;
 ################################################################
 
 my @crowd = map { WebGUI::User->new($session, "new") } 0..7;
-WebGUI::Test->usersToDelete(@crowd);
+WebGUI::Test->addToCleanup(@crowd);
 my @mob;
 foreach my $idx (0..2) {
 	$mob[$idx] = WebGUI::User->new($session, "new");
 	$mob[$idx]->username("mob$idx");
 }
-WebGUI::Test->usersToDelete(@mob);
+WebGUI::Test->addToCleanup(@mob);
 
 my @bUsers = map { $_->userId } @crowd[0,1];
 my @aUsers = map { $_->userId } @crowd[2,3];
@@ -404,10 +404,10 @@ cmp_bag($everyUsers, $everyoneGroup->getUsers(), 'addUsers will not add a user t
 ##Check expire time override on addUsers
 
 my $expireOverrideGroup = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($expireOverrideGroup);
+WebGUI::Test->addToCleanup($expireOverrideGroup);
 $expireOverrideGroup->expireOffset('50');
 my $expireOverrideUser = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($expireOverrideUser);
+WebGUI::Test->addToCleanup($expireOverrideUser);
 $expireOverrideGroup->addUsers([$expireOverrideUser->userId], '5000');
 my $expirationDate = $session->db->quickScalar('select expireDate from groupings where userId=?', [$expireOverrideUser->userId]);
 cmp_ok($expirationDate-time(), '>', 50, 'checking expire offset override on addUsers');
@@ -458,7 +458,7 @@ ok( isIn($mob[0]->userId, @{ $gZ->getAllUsers() }), 'mob[0] in list of group Z u
 my $gK = WebGUI::Group->new($session, "new");
 $gK->name('Group K');
 $gC->addGroups([$gK->getId]);
-WebGUI::Test->groupsToDelete($gK);
+WebGUI::Test->addToCleanup($gK);
 
 #      B
 #     / \
@@ -475,7 +475,7 @@ foreach my $idx (0..3) {
 	$chameleons[$idx] = WebGUI::User->new($session, "new");
 	$chameleons[$idx]->username("chameleon$idx");
 }
-WebGUI::Test->usersToDelete(@chameleons);
+WebGUI::Test->addToCleanup(@chameleons);
 
 foreach my $idx (0..3) {
 	$chameleons[$idx]->karma(5*$idx, 'testCode', 'testable karma, dude');
@@ -519,7 +519,7 @@ $session->setting->set('useKarma', $defaultKarmaSetting);
 my $gS = WebGUI::Group->new($session, "new");
 $gS->name('Group S');
 $gC->addGroups([$gS->getId]);
-WebGUI::Test->groupsToDelete($gS);
+WebGUI::Test->addToCleanup($gS);
 
 #        B
 #    	/ \
@@ -557,8 +557,8 @@ foreach my $idx (0..$#scratchTests) {
 		$sessionBank[$idx]->scratch->set($name, $value);
 	}
 }
-WebGUI::Test->usersToDelete(@itchies);
+WebGUI::Test->addToCleanup(@itchies);
-WebGUI::Test->sessionsToDelete(@sessionBank);
+WebGUI::Test->addToCleanup(@sessionBank);
 
 foreach my $scratchTest (@scratchTests) {
 	is($scratchTest->{user}->isInGroup($gS->getId), $scratchTest->{expect}, $scratchTest->{comment});
@@ -597,11 +597,11 @@ foreach my $idx (0..$#ipTests) {
 	##Assign this user to this test to be fetched later
 	$ipTests[$idx]->{user} = $tcps[$idx];
 }
-WebGUI::Test->usersToDelete(@tcps);
+WebGUI::Test->addToCleanup(@tcps);
-WebGUI::Test->sessionsToDelete(@sessionBank);
+WebGUI::Test->addToCleanup(@sessionBank);
 
 my $gI = WebGUI::Group->new($session, "new");
-WebGUI::Test->groupsToDelete($gI);
+WebGUI::Test->addToCleanup($gI);
 $gI->name('Group I');
 $gI->ipFilter('194.168.0.0/24');
 
@@ -624,7 +624,7 @@ foreach my $ipTest (@ipTests) {
 ##Cache check.
 
 my $cacheDude = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($cacheDude);
+WebGUI::Test->addToCleanup($cacheDude);
 $cacheDude->username('Cache Dude');
 
 $gY->addUsers([$cacheDude->userId]);
@@ -638,7 +638,7 @@ ok( !$cacheDude->isInGroup($gY->getId), "Cache dude removed from group Y");
 ok( !$cacheDude->isInGroup($gZ->getId), "Cache dude removed from group Z too");
 
 my $gCache = WebGUI::Group->new($session, "new");
-WebGUI::Test->groupsToDelete($gCache);
+WebGUI::Test->addToCleanup($gCache);
 
 $gCache->addUsers([$cacheDude->userId]);
 

t/Group/resetGroupFields.t

@@ -25,13 +25,13 @@ plan tests => 10;
 my $session = WebGUI::Test->session;
 
 my $assetGroup = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($assetGroup);
+WebGUI::Test->addToCleanup($assetGroup);
 
 my $settingGroup = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($settingGroup);
+WebGUI::Test->addToCleanup($settingGroup);
 
 my $activityGroup = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($activityGroup);
+WebGUI::Test->addToCleanup($activityGroup);
 
 my $home = WebGUI::Asset->getDefault($session);
 
@@ -89,7 +89,7 @@ my $workflow  = WebGUI::Workflow->create($session,
         mode       => 'realtime',
     },
 );
-WebGUI::Test->workflowsToDelete($workflow);
+WebGUI::Test->addToCleanup($workflow);
 
 WebGUI::Test->originalConfig('workflowActivities');
 $session->config->addToArray('workflowActivities/User', 'WebGUI::Workflow::Activity::AddUserToGroup');
@@ -177,4 +177,4 @@ $activityGroup->delete;
 my $userActivity2 = WebGUI::Workflow::Activity->new($session, $userActivity->getId);
 is ($userActivity2->get('groupId'), 3, 'group in Workflow Activity set to Admin');
 
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));

t/Inbox.t

@@ -75,7 +75,7 @@ my @senders = ();
 push @senders, WebGUI::User->create($session);
 push @senders, WebGUI::User->create($session);
 push @senders, WebGUI::User->create($session);
-WebGUI::Test->usersToDelete(@senders);
+WebGUI::Test->addToCleanup(@senders);
 $senders[0]->username('first');
 $senders[0]->profileField('firstName', 'First Only');
 $senders[1]->username('last');

t/Keyword.t

@@ -69,7 +69,7 @@ my $snippet = $home->addChild({
 });
 
 my $tag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 $tag->commit;
 
 my $assetIds = $keyword->getMatchingAssets({ keyword => 'webgui', });

t/Macro.t

@@ -31,7 +31,7 @@ $session->asset($defaultAsset);
 ##Create a non-admin user who will be in the Registered User group
 my $registeredUser = WebGUI::User->new($session, "new");
 $registeredUser->username('TimBob');
-WebGUI::Test->usersToDelete($registeredUser);
+WebGUI::Test->addToCleanup($registeredUser);
 $session->user({user => $registeredUser});
 
 WebGUI::Test->originalConfig('macros');

t/Macro/FilePump.t

@@ -54,14 +54,14 @@ $fileAsset->getStorageLocation->addFileFromScalar('pumpfile.css', qq|   body {\n
 is($fileAsset->getStorageLocation->getFileContentsAsScalar($fileAsset->get('filename')), qq|   body {\npadding:   0px;}\n\n|, 'Sanity check - got back expected file contents');
 
 my $snippetTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($snippetTag);
+WebGUI::Test->addToCleanup($snippetTag);
 $snippetTag->commit;
 
 ok($bundle->addFile('JS',  'asset://filePumpSnippet'), 'Added filePumpSnippet');
 ok($bundle->addFile('CSS', 'asset://filePumpFileAsset'), 'Added filePumpAsset');
 
 my $storedFile = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storedFile);
+WebGUI::Test->addToCleanup($storedFile);
 $storedFile->addFileFromScalar('storedJS.js', qq|function helloWorld() { alert("Hellow world");}|, );
 # Turn into file:uploads/path/to/fileAsset (bc file uris must begin with either file:uploads/ or file:extras/)
 my $path = Path::Class::File->new($storedFile->getPath($storedFile->get('filename')));

t/Macro/FileUrl.t

@@ -115,7 +115,7 @@ sub setupTest {
 	foreach my $testSet (@testSets) {
 
 		my $storage = WebGUI::Storage->create($session);
-        WebGUI::Test->storagesToDelete($storage);
+        WebGUI::Test->addToCleanup($storage);
 		my $filename = join '.', 'fileName', $testNum;
 		$testSet->{filename} = $filename;
 

t/Macro/Include.t

@@ -30,7 +30,7 @@ my $spectreConf = WebGUI::Paths->spectreConfig;
 my $goodFile = 'The contents of this file are accessible';
 my $twoLines = "This file contains two lines of text\nThis is the second line";
 my $storage = WebGUI::Storage->createTemp($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 $storage->addFileFromScalar('goodFile', $goodFile);
 $storage->addFileFromScalar('twoLines', $twoLines);
 $storage->addFileFromScalar('unreadableFile', 'The contents of this file are not readable');

t/Macro/Thumbnail.t

@@ -35,7 +35,7 @@ $square->setBackgroundColor('#0000FF');
 
 ##Create a storage location
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 
 ##Save the image to the location
 $square->saveToStorageLocation($storage, 'square.png');

t/Macro/User.t

@@ -51,7 +51,7 @@ plan tests => $numTests;
 
 @testSets = setupTest($session, @testSets);
 my @users = map { $_->{user} } @testSets;
-WebGUI::Test->usersToDelete(@users);
+WebGUI::Test->addToCleanup(@users);
 
 foreach my $testSet (@testSets) {
 	$session->user({ userId => $testSet->{user}->userId });

t/Mail/Send.t

@@ -269,7 +269,7 @@ SKIP: {
 #----------------------------------------------------------------------------
 
 my $inboxUser = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($inboxUser);
+WebGUI::Test->addToCleanup($inboxUser);
 $inboxUser->username('red');
 $inboxUser->profileField('receiveInboxEmailNotifications', 1);
 $inboxUser->profileField('receiveInboxSmsNotifications',   0);
@@ -278,17 +278,17 @@ $inboxUser->profileField('cellPhone', '55555');
 $session->setting->set('smsGateway', 'textme.com');
 
 my $emailUser = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($emailUser);
+WebGUI::Test->addToCleanup($emailUser);
 $emailUser->username('heywood');
 $emailUser->profileField('email', 'heywood@shawshank.gov');
 
 my $lonelyUser = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($lonelyUser);
+WebGUI::Test->addToCleanup($lonelyUser);
 $lonelyUser->profileField('receiveInboxEmailNotifications', 0);
 $lonelyUser->profileField('email',   'jake@shawshank.gov');
 
 my $inboxGroup = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($inboxGroup);
+WebGUI::Test->addToCleanup($inboxGroup);
 $inboxGroup->addUsers([$emailUser->userId, $inboxUser->userId, $lonelyUser->userId]);
 
 SKIP: {

t/ProfileField.t

@@ -28,7 +28,7 @@ use WebGUI::Form::HTMLArea;
 my $session         = WebGUI::Test->session;
 
 my $newUser         = WebGUI::User->create( $session );
-WebGUI::Test->usersToDelete($newUser);
+WebGUI::Test->addToCleanup($newUser);
 
 #----------------------------------------------------------------------------
 # Tests

t/Search.t

@@ -72,7 +72,7 @@ SKIP: {
     } );
     my $tag = WebGUI::VersionTag->getWorking( $session );
     $tag->commit;
-    WebGUI::Test->tagsToRollback($tag);
+    WebGUI::Test->addToCleanup($tag);
     WebGUI::Search::Index->create( $article );
     my $searcher = WebGUI::Search->new($session);
     my $assetIds = $searcher->search({ keywords => "Chinese", })->getAssetIds;

t/Search/Index.t

@@ -33,7 +33,7 @@ my $article         = WebGUI::Asset->getImportNode( $session )->addChild( {
     title           => 'title',
     menuTitle       => 'menuTitle',
 } );
-WebGUI::Test->tagsToRollback(
+WebGUI::Test->addToCleanup(
     WebGUI::VersionTag->getWorking( $session ),
 );
 

t/Session.t

@@ -24,7 +24,7 @@ plan tests => 4; # increment this value for each test you create
 my $session = WebGUI::Test->session;
 
 my $user = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 
 $session->user({user => $user});
 

t/Session/DateTime.t

@@ -100,13 +100,13 @@ is ($dt->getTimeZone(), 'America/Chicago', 'getTimeZone: time zones not in the a
 my $dude = WebGUI::User->new($session, "new");
 $dude->profileField('timeZone', 'Australia/Perth');
 $session->user({user => $dude});
-WebGUI::Test->usersToDelete($dude);
+WebGUI::Test->addToCleanup($dude);
 is ($dt->getTimeZone(), 'Australia/Perth', 'getTimeZone: valid time zones are allowed');
 
 my $bud = WebGUI::User->new($session, "new");
 $bud->profileField('timeZone', '');
 $session->user({user => $bud});
-WebGUI::Test->usersToDelete($bud);
+WebGUI::Test->addToCleanup($bud);
 is ($dt->getTimeZone(), 'America/Chicago', q|getTimeZone: if user's time zone doesn't exist, then return America/Chicago|);
 
 $session->user({userId => 1});  ##back to Visitor

t/Shop/AddressBook.t

@@ -211,7 +211,7 @@ undef $book;
 
 my $otherSession = WebGUI::Test->newSession;
 my $mergeUser    = WebGUI::User->create($otherSession);
-WebGUI::Test->usersToDelete($mergeUser);
+WebGUI::Test->addToCleanup($mergeUser);
 $otherSession->user({user => $mergeUser});
 my $adminBook   = WebGUI::Shop::AddressBook->create($otherSession);
 my $goodAddress = $adminBook->addAddress({label => 'first'});

t/Shop/ShipDriver/UPS.t

@@ -33,7 +33,7 @@ use Locales;
 # Init
 my $session   = WebGUI::Test->session;
 my $user      = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $session->user({user => $user});
 
 #----------------------------------------------------------------------------

t/Shop/ShipDriver/USPS.t

@@ -31,7 +31,7 @@ plan tests => 69;
 # Init
 my $session   = WebGUI::Test->session;
 my $user      = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $session->user({user => $user});
 
 #----------------------------------------------------------------------------

t/Shop/ShipDriver/USPSInternational.t

@@ -31,7 +31,7 @@ plan tests => 40;
 # Init
 my $session   = WebGUI::Test->session;
 my $user      = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $session->user({user => $user});
 
 #----------------------------------------------------------------------------

t/Shop/TaxDriver/EU.t

@@ -35,7 +35,7 @@ my $session         = WebGUI::Test->session;
 # Test user
 my $taxUser     = WebGUI::User->new( $session, 'new' );
 $taxUser->username( 'Tex Evasion' );
-WebGUI::Test->usersToDelete($taxUser);
+WebGUI::Test->addToCleanup($taxUser);
 
 # Test VAT numbers
 my $testVAT_NL  = 'NL123456789B12';

t/Shop/Vendor.t

@@ -45,7 +45,7 @@ my $fenceUser = WebGUI::User->new($session, 'new');
 $fenceUser->username('fence');
 my $guardUser = WebGUI::User->new($session, 'new');
 $guardUser->username('guard');
-WebGUI::Test->usersToDelete($fenceUser, $guardUser);
+WebGUI::Test->addToCleanup($fenceUser, $guardUser);
 
 SKIP: {
 

t/Storage/Image.t

@@ -82,7 +82,7 @@ ok ($uploadUrl, "uploadDir defined in config");
 ####################################################
 
 my $imageStore = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($imageStore);
+WebGUI::Test->addToCleanup($imageStore);
 my $expectedFiles = ['.', ];
 cmp_bag($imageStore->getFiles(1), $expectedFiles, 'Starting with an empty storage object, no files in here except for . and ..');
 $imageStore->addFileFromScalar('.dotfile', 'dot file');
@@ -119,7 +119,7 @@ foreach my $extTest ( @{ $extensionTests } ) {
 WebGUI::Test->interceptLogging();
 
 my $thumbStore = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($thumbStore);
+WebGUI::Test->addToCleanup($thumbStore);
 my $square = WebGUI::Image->new($session, 500, 500);
 $square->setBackgroundColor('#FF0000');
 $square->saveToStorageLocation($thumbStore, 'square.png');
@@ -170,7 +170,7 @@ like($WebGUI::Test::logger_error, qr/^Couldn't read image to check the size of i
 ####################################################
 
 my $imageCopy = $thumbStore->copy();
-WebGUI::Test->storagesToDelete($imageCopy);
+WebGUI::Test->addToCleanup($imageCopy);
 isa_ok($imageCopy, 'WebGUI::Storage', 'copy returns an object');
 cmp_bag(
     $imageCopy->getFiles(),
@@ -219,7 +219,7 @@ is($thumbStore->getThumbnailUrl('square.png'), $thumbStore->getUrl('thumb-square
 my $origMaxImageSize = $session->setting->get('maxImageSize');
 
 my $sizeTest = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($sizeTest);
+WebGUI::Test->addToCleanup($sizeTest);
 
 my $resizeTarget = 80;
 $session->setting->set('maxImageSize', 200 );

t/User.t

@@ -35,7 +35,7 @@ my $lastUpdate;
 #Let's try to create a new user and make sure we get an object back
 my $userCreationTime = time();
 ok(defined ($user = WebGUI::User->new($session,"new")), 'new("new") -- object reference is defined');
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 
 #New does not return undef if something breaks, so we'll see if the _profile hash was set.
 ok(exists $user->{_profile}, 'new("new") -- profile subhash exists');  
@@ -410,7 +410,7 @@ $cm->ipFilter(defined $origFilter ? $origFilter : '');
 
 ##Test for group membership
 $user = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 ok($user->isInGroup(7), "addToGroups: New user is in group 7(Everyone)");
 ok(!$user->isInGroup(1),  "New user not in group 1 (Visitors)");
 ok($user->isRegistered, "User is not a visitor");
@@ -465,7 +465,7 @@ ok($visitor->isInGroup(7), "Visitor added back to group Everyone");
 ################################################################
 
 my $dude = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($dude);
+WebGUI::Test->addToCleanup($dude);
 
 ok(!$dude->canUseAdminMode, 'canUseAdminMode: newly created users cannot');
 
@@ -564,7 +564,7 @@ is($useru->userId, $dude->userId, '... and it is the right user object');
 ################################################################
 
 my $buster = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($buster);
+WebGUI::Test->addToCleanup($buster);
 is( $buster->profileField('timeZone'), 'America/Chicago', 'buster received original user profile on user creation');
 
 my $profileField = WebGUI::ProfileField->new($session, 'timeZone');
@@ -593,7 +593,7 @@ $copiedAliasProfile{'dataDefault'} = "'aliasAlias'"; ##Non word characters;
 $aliasProfile->set(\%copiedAliasProfile);
 
 my $buster3 = WebGUI::User->new($session, $buster->userId);
-WebGUI::Test->usersToDelete($buster);
+WebGUI::Test->addToCleanup($buster);
 is($buster3->profileField('alias'), 'aliasAlias', 'default alias set');
 
 $copiedAliasProfile{'dataDefault'} = "'....^^^^....'"; ##Non word characters;
@@ -640,7 +640,7 @@ is($session->scratch->get('hack'), undef, 'userProfile dataDefault is not execut
 ##Set up a group that has expired.
 
 my $expiredGroup = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($expiredGroup);
+WebGUI::Test->addToCleanup($expiredGroup);
 $expiredGroup->name('Group that expires users automatically');
 $expiredGroup->expireOffset(-1000);
 
@@ -669,7 +669,7 @@ cmp_bag($dude->getGroups(1), [2, 7], 'Accessing the cached list of groups does n
 ################################################################
 
 my $friend = WebGUI::User->new($session, 'new');
-WebGUI::Test->usersToDelete($friend);
+WebGUI::Test->addToCleanup($friend);
 is($friend->getFirstName, undef, 'with no profile settings, getFirstName returns undef');
 
 $friend->username('friend');
@@ -686,7 +686,7 @@ is($friend->getFirstName, 'Mr', 'firstName is the highest priority profile setti
 ################################################################
 
 my $neighbor = WebGUI::User->new($session, 'new');
-WebGUI::Test->usersToDelete($neighbor);
+WebGUI::Test->addToCleanup($neighbor);
 
 is($neighbor->getWholeName, undef, 'with no profile settings, getWholeName returns undef');
 $neighbor->username('neighbor');
@@ -778,7 +778,7 @@ foreach my $groupName (qw/red pink orange blue turquoise lightBlue purple/) {
     $groupSet{$groupName} = WebGUI::Group->new($session, 'new');
     $groupSet{$groupName}->name($groupName);
 }
-WebGUI::Test->groupsToDelete(values %groupSet);
+WebGUI::Test->addToCleanup(values %groupSet);
 
 $groupSet{blue}->expireOffset(-1500);
 
@@ -789,7 +789,7 @@ $groupSet{pink}->addGroups(   [ map { $groupSet{$_}->getId } qw/red/ ] );
 $groupSet{orange}->addGroups( [ map { $groupSet{$_}->getId } qw/red/ ] );
 
 my $newFish = WebGUI::User->new($session, 'new');
-WebGUI::Test->usersToDelete($newFish);
+WebGUI::Test->addToCleanup($newFish);
 $newFish->addToGroups([ $groupSet{red}->getId, $groupSet{blue}->getId ]);
 
 cmp_bag(
@@ -823,7 +823,7 @@ SKIP: {
 ok( my $newCreateUser = WebGUI::User->create( $session ),
     'create() returns something'
 );
-WebGUI::Test->usersToDelete($newCreateUser);
+WebGUI::Test->addToCleanup($newCreateUser);
 isa_ok( $newCreateUser, 'WebGUI::User', 'create() returns a WebGUI::User' );
 
 ################################################################
@@ -986,7 +986,7 @@ $friend->deleteFromGroups([$neighbor->friends->getId]);
 
 $session->setting->set('smsGateway', '');
 my $inmate = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($inmate);
+WebGUI::Test->addToCleanup($inmate);
 $inmate->profileField('email',     '');
 $inmate->profileField('cellPhone', '');
 $inmate->profileField('receiveInboxEmailNotifications', 0);
@@ -1039,7 +1039,7 @@ is($inmate->getInboxSmsNotificationAddress, '5555555555@textme.com', '... strips
 ##Specifically, cleaning up Address books
 
 my $shopUser = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($shopUser);
+WebGUI::Test->addToCleanup($shopUser);
 $session->user({user => $shopUser});
 my $book = WebGUI::Shop::AddressBook->create($session);
 is ($book->get('userId'), $shopUser->userId, 'delete: Address book created with proper user');

t/VersionTag.t

@@ -241,7 +241,7 @@ is($siteWideTag->getId(), $siteWideTagId, 'versionTagMode siteWide: reclaim site
 ## Through in a new session as different user
 my $admin_session = WebGUI::Session->open(WebGUI::Test->file);
 $admin_session->user({'userId' => 3});
-WebGUI::Test->sessionsToDelete($admin_session);
+WebGUI::Test->addToCleanup($admin_session);
 
 setUserVersionTagMode($admin_session->user(), q{singlePerUser});
 

t/Workflow/Activity/CalendarUpdateFeeds.t

@@ -65,7 +65,7 @@ my $party = $sender->addChild({
 
 my $tag = WebGUI::VersionTag->getWorking($session);
 $tag->commit;
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 
 my $workflow  = WebGUI::Workflow->create($session,
     {

t/Workflow/Activity/ExpireIncompleteSurveyResponses.t

@@ -26,19 +26,19 @@ my $wf = WebGUI::Workflow->create($session, {
     mode => 'realtime',
 });
 isa_ok($wf, 'WebGUI::Workflow', 'Test workflow');
-WebGUI::Test->workflowsToDelete($wf);
+WebGUI::Test->addToCleanup($wf);
 
 my $activity = $wf->addActivity('WebGUI::Workflow::Activity::ExpireIncompleteSurveyResponses');
 isa_ok($activity, 'WebGUI::Workflow::Activity::ExpireIncompleteSurveyResponses', 'Test wf activity');
 $activity->set('title', 'Test Expire Incomplete Survey Responses');
 
 my $user = WebGUI::User->new($session, 'new');
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 
 # Create a Survey
 my $survey = WebGUI::Asset->getImportNode($session)->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));
-WebGUI::Test->assetsToPurge($survey);
+WebGUI::Test->addToCleanup($survey);
 my $sJSON = $survey->surveyJSON;
 $sJSON->newObject([0]);    # add a question to 0th section
 $sJSON->update([0,0], { questionType => 'Yes/No' });
@@ -118,7 +118,7 @@ is( scalar $session->db->buildArray($SQL), 0, 'Afterwards, back to no incomplete
 
 # Create a new revision
 $survey->addRevision({}, time+1);
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));
 
 # Undo out handiwork again
 is($session->db->quickScalar('select count(*) from Survey_response where Survey_responseId = ?', [$responseId]), 1, 'Start off with 1 response');

t/Workflow/Activity/RemoveOldCarts.t

@@ -32,7 +32,7 @@ my $donation = $root->addChild({
 });
 my $tag = WebGUI::VersionTag->getWorking($session);
 $tag->commit;
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 
 
 my $cart1 = WebGUI::Shop::Cart->create($session);

t/Workflow/Activity/SendNewsletters.t

@@ -70,7 +70,7 @@ my $thread = $cs->addChild({
 }, undef, undef, {skipAutoCommitWorkflows => 1,});
 
 $versionTag->commit;
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 ##Setup metadata
 $session->setting->set('metaDataEnabled', 1);
@@ -84,7 +84,7 @@ $thread->updateMetaData($metaDataFields->{newsletterCategory}, 'Andy');
 ##Create subscriber user
 my $subscriber = WebGUI::User->create($session);
 $subscriber->update({ 'email', 'going@nowhere.com' });
-WebGUI::Test->usersToDelete($subscriber);
+WebGUI::Test->addToCleanup($subscriber);
 $cs->setUserSubscriptions($metaDataFields->{newsletterCategory}."~Andy", $subscriber->getId);
 $session->db->write(<<EOSQL, [ time()-24*60*60, $cs->getId, $subscriber->getId ]);
 update Newsletter_subscriptions set lastTimeSent=? where assetId=? and userId=?

t/lib/WebGUI/Test.pm

@@ -659,123 +659,6 @@ sub getMailFromQueue {
     return $class->getMail;
 }
 
-#----------------------------------------------------------------------------
-
-=head2 sessionsToDelete ( $session, [$session, ...] )
-
-Push a list of session objects onto the stack of groups to be automatically deleted
-at the end of the test.  Note, this will be the last group of objects to be
-cleaned up.
-
-This is a class method.
-
-=cut
-
-sub sessionsToDelete {
-    my $class = shift;
-    $class->addToCleanup(@_);
-}
-
-#----------------------------------------------------------------------------
-
-=head2 assetsToPurge ( $asset, [$asset ] )
-
-Push a list of Asset objects onto the stack of assets to be automatically purged
-at the end of the test.  This will also clean-up all version tags associated
-with the Asset.
-
-This is a class method.
-
-=cut
-
-sub assetsToPurge {
-    my $class = shift;
-    $class->addToCleanup(@_);
-}
-
-#----------------------------------------------------------------------------
-
-=head2 groupsToDelete ( $group, [$group ] )
-
-Push a list of group objects onto the stack of groups to be automatically deleted
-at the end of the test.
-
-This is a class method.
-
-=cut
-
-sub groupsToDelete {
-    my $class = shift;
-    $class->addToCleanup(@_);
-}
-
-
-#----------------------------------------------------------------------------
-
-=head2 storagesToDelete ( $storage, [$storageId ] )
-
-Push a list of storage objects or storageIds onto the stack of storage locaitons
-at the end of the test.
-
-This is a class method.
-
-=cut
-
-sub storagesToDelete {
-    my $class = shift;
-    $class->addToCleanup(map {
-        ref $_ ? $_ : ('WebGUI::Storage' => $_)
-    } @_);
-}
-
-#----------------------------------------------------------------------------
-
-=head2 tagsToRollback ( $tag )
-
-Push a list of version tags to rollback at the end of the test.
-
-This is a class method.
-
-=cut
-
-sub tagsToRollback {
-    my $class = shift;
-    $class->addToCleanup(@_);
-}
-
-#----------------------------------------------------------------------------
-
-=head2 usersToDelete ( $user, [$user, ...] )
-
-Push a list of user objects onto the stack of groups to be automatically deleted
-at the end of the test.  If found in the stack, the Admin and Visitor users will not be deleted.
-
-This is a class method.
-
-=cut
-
-sub usersToDelete {
-    my $class = shift;
-    $class->addToCleanup(@_);
-}
-
-#----------------------------------------------------------------------------
-
-=head2 workflowsToDelete ( $workflow, [$workflow, ...] )
-
-Push a list of workflow objects onto the stack of groups to be automatically deleted
-at the end of the test.
-
-This is a class method.
-
-=cut
-
-sub workflowsToDelete {
-    my $class = shift;
-    $class->addToCleanup(@_);
-}
-
-
 #----------------------------------------------------------------------------
 
 =head2 cleanupGuard ( $object, $class => $ident )