diff --git a/t/Asset/AssetClipboard.t b/t/Asset/AssetClipboard.t
index acf95a1e0..c3767a427 100644
--- a/t/Asset/AssetClipboard.t
+++ b/t/Asset/AssetClipboard.t
@@ -214,20 +214,22 @@ my $process = Test::MockObject::Extends->new( 'WebGUI::Fork' );
 $process->mock( "update" => sub { } ); # do nothing on update. we don't care
 $process->mock( "session" => sub { return $session } );
 
+
 # Try with a Collaboration and some Threads
 my $tag = WebGUI::VersionTag->getWorking( $session );
+WebGUI::Test->addToCleanup($tag);
 my $collab = $tempspace->addChild({
     className => 'WebGUI::Asset::Wobject::Collaboration',
     groupIdEdit => "3",
     status => "pending",
     tagId => $tag->getId,
-});
+}, undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 });
 my $thread = $collab->addChild({
     className => 'WebGUI::Asset::Post::Thread',
     groupIdEdit => "3",
     status => "pending",
     tagId => $tag->getId,
-}, undef, undef, { skipAutoCommitWorkflows => 1 });
+}, undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 });
 $tag->commit;
 $thread->cut;
 WebGUI::Asset::pasteInFork( $process, { assetId => $collab->getId, list => [ $thread->getId ] } );
diff --git a/t/Asset/File.t b/t/Asset/File.t
index ba23841c4..b677ff28e 100644
--- a/t/Asset/File.t
+++ b/t/Asset/File.t
@@ -124,7 +124,6 @@ cmp_deeply(
 my $newRev  = $asset->addRevision( { groupIdView => '7' }, time + 8 );
 WebGUI::Test::addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 is( $newRev->getStorageLocation->getFileContentsAsScalar('.wgaccess'), undef, "wgaccess doesn't exist" );
-note( @{ $newRev->getStorageLocation->getFiles() } );
 
 #----------------------------------------------------------------------------
 # commit on new revision trashes old revision
diff --git a/t/Asset/Wobject/Collaboration/templateVariables.t b/t/Asset/Wobject/Collaboration/templateVariables.t
index e151cec43..7cab1d4e0 100644
--- a/t/Asset/Wobject/Collaboration/templateVariables.t
+++ b/t/Asset/Wobject/Collaboration/templateVariables.t
@@ -54,7 +54,7 @@ my @threads = (
 $_->setSkipNotification for @threads; # 100+ messages later...
 my $versionTag = WebGUI::VersionTag->getWorking( $session );
 $versionTag->commit;
-addToCleanup($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my $templateVars;
 my $posts;
diff --git a/t/Asset/Wobject/Collaboration/unarchiveAll.t b/t/Asset/Wobject/Collaboration/unarchiveAll.t
index 3ec155115..ff3610d6c 100644
--- a/t/Asset/Wobject/Collaboration/unarchiveAll.t
+++ b/t/Asset/Wobject/Collaboration/unarchiveAll.t
@@ -35,7 +35,7 @@ my @threads = (
         className       => 'WebGUI::Asset::Post::Thread',
         status          => 'archived',
         title           => 'Archived',
-    }, undef, undef, { skipAutoCommitWorkflows => 1 }),
+    }, undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 }),
 );
 
 my $tag = WebGUI::VersionTag->getWorking( $session );
diff --git a/t/Storage.t b/t/Storage.t
index 8fcfe419c..6089a79c6 100644
--- a/t/Storage.t
+++ b/t/Storage.t
@@ -418,8 +418,6 @@ isnt($untarStorage->getPath, $tarStorage->getPath, 'untar did not reuse the same
 $tarStorage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('extensions.tar'));
 my $extensionStorage = $tarStorage->untar('extensions.tar');
 WebGUI::Test->addToCleanup($extensionStorage);
-use Data::Dumper;
-diag Dumper $extensionStorage->getFiles;
 cmp_bag(
     $extensionStorage->getFiles, 
     [ qw{ extension_pm.txt extension_perl.txt extension_html.txt extensions extensions/extension_html.txt }], 
diff --git a/t/Workflow/Activity/UpdateAssetSubscribers.t b/t/Workflow/Activity/UpdateAssetSubscribers.t
index 285dd8e86..d8d8617eb 100644
--- a/t/Workflow/Activity/UpdateAssetSubscribers.t
+++ b/t/Workflow/Activity/UpdateAssetSubscribers.t
@@ -41,7 +41,7 @@ my $cs = $root->addChild({
 });
 my $tag = WebGUI::VersionTag->getWorking($session);
 $tag->commit;
-WebGUI::Test->addToCleanup($tag, $subscriberGroup, $betterGroup, $oldUser, $betterUser, $otherUser);
+WebGUI::Test->addToCleanup($tag, $oldGroup, $subscriberGroup, $betterGroup, $oldUser, $betterUser, $otherUser);
 
 $subscriberGroup->addUsers([$oldUser->getId, $betterUser->getId, ]);
 $betterGroup->addUsers([$betterUser->getId, ]);