diff --git a/t/Asset/AssetMetaData.t b/t/Asset/AssetMetaData.t
index 05fb0c648..71f2936be 100644
--- a/t/Asset/AssetMetaData.t
+++ b/t/Asset/AssetMetaData.t
@@ -30,6 +30,7 @@ $session->user({userId => 3});
 my $root = WebGUI::Asset->getRoot($session);
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Asset Package test"});
+WebGUI::Test->addToCleanup($versionTag);
 
 ####################################################
 #
@@ -229,11 +230,4 @@ END {
     foreach my $metaDataFieldId (keys %{ $snippet->getMetaDataFields }) {
         $snippet->deleteMetaDataField($metaDataFieldId);
     }
-
-    foreach my $tag($versionTag) {
-        if (defined $tag and ref $tag eq 'WebGUI::VersionTag') {
-            $tag->rollback;
-        }
-    }
-
 }
diff --git a/t/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t
index dd3d16fd4..96a1d445a 100644
--- a/t/Asset/EMSSubmissionForm.t
+++ b/t/Asset/EMSSubmissionForm.t
@@ -504,12 +504,4 @@ $sub1->getFormattedComments;
 
 } [], 'no warnings from calling a bunch of functions';
 
-#done_testing();
-#print 'press return to complete test' ; <>;
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-
-}
 #vim:ft=perl
diff --git a/t/Asset/File/setfile.t b/t/Asset/File/setfile.t
index 88f61f1a7..8227f6df8 100644
--- a/t/Asset/File/setfile.t
+++ b/t/Asset/File/setfile.t
@@ -30,6 +30,7 @@ my $file
         className           => "WebGUI::Asset::File",
     });
 $versionTag->commit;
+WebGUI::Test->addToCleanup($versionTag);
 
 #----------------------------------------------------------------------------
 # Tests
@@ -53,11 +54,4 @@ is_deeply(
     $storage->getFiles, ['WebGUI.pm'],
     "Storage location contains only the file we added",
 );
-
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $versionTag->rollback();
-}
-
+#vim:ft=perl
diff --git a/t/Asset/MatrixListing.t b/t/Asset/MatrixListing.t
index 6e23b9577..dd4dd75c2 100644
--- a/t/Asset/MatrixListing.t
+++ b/t/Asset/MatrixListing.t
@@ -26,6 +26,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 my ($matrix, $matrixListing);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set({name=>"Matrix Listing Test"});
 
 $matrix = $node->addChild({className=>'WebGUI::Asset::Wobject::Matrix'});
@@ -34,6 +35,7 @@ $matrixListing = $matrix->addChild({className=>'WebGUI::Asset::MatrixListing'});
 
 # Wikis create and autocommit a version tag when a child is added.  Lets get the name so we can roll it back.
 my $secondVersionTag = WebGUI::VersionTag->new($session,$matrixListing->get("tagId"));
+WebGUI::Test->addToCleanup($secondVersionTag);
 
 # Test for sane object types
 isa_ok($matrix, 'WebGUI::Asset::Wobject::Matrix');
@@ -53,11 +55,4 @@ isa_ok($matrixListing, 'WebGUI::Asset::MatrixListing');
 #    local $TODO = "Tests to make later";
 #    ok(0, 'Lots and lots to do');
 #}
-
-END {
-	# Clean up after thy self
-	$versionTag->rollback();
-	$secondVersionTag->rollback();
-	#$thirdVersionTag->rollback();
-}
-
+#vim:ft=perl
diff --git a/t/Asset/Post/Thread/getAdjacentThread.t b/t/Asset/Post/Thread/getAdjacentThread.t
index 12b26890c..a38f71fc4 100644
--- a/t/Asset/Post/Thread/getAdjacentThread.t
+++ b/t/Asset/Post/Thread/getAdjacentThread.t
@@ -61,6 +61,7 @@ my @threads = (
 
 $_->setSkipNotification for @threads; 
 $versionTags[-1]->commit;
+WebGUI::Test->addToCleanup($versionTags[-1]);
 
 #----------------------------------------------------------------------------
 # Tests
@@ -133,6 +134,7 @@ $collab->update({
     sortOrder   => 'desc',
 });
 push @versionTags, WebGUI::VersionTag->getWorking( $session );
+WebGUI::Test->addToCleanup($versionTags[-1]);
 push @threads, $collab->addChild( {
         className       => 'WebGUI::Asset::Post::Thread',
         title           => "Abababa",
@@ -146,12 +148,6 @@ testGetAdjacentThread( "sort by default from asset with version tag", $sort, [ q
 $session->scratch->delete($collab->getId.'_sortBy');
 $session->scratch->delete($collab->getId.'_sortDir');
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $_->rollback for @versionTags;
-}
-
 #----------------------------------------------------------------------------
 # testGetAdjacentThread ( label, sort, order, @threads )
 # Performs two tests for each thread in [order]
diff --git a/t/Asset/Redirect/mech.t b/t/Asset/Redirect/mech.t
index 85cadb959..6eb98881c 100644
--- a/t/Asset/Redirect/mech.t
+++ b/t/Asset/Redirect/mech.t
@@ -63,6 +63,7 @@ my $redirectToAsset
         snippet         => $testContent,
     });
 $versionTags[-1]->commit;
+WebGUI::Test->addToCleanup($versionTags[-1]);
 
 #----------------------------------------------------------------------------
 # Tests
@@ -81,6 +82,7 @@ plan tests => 12;        # Increment this number for each test you create
 #----------------------------------------------------------------------------
 # Test operation with a public Redirect
 push @versionTags, WebGUI::VersionTag->getWorking( $session );
+WebGUI::Test->addToCleanup($versionTags[-1]);
 $redirect       
     = $node->addChild({
         className       => 'WebGUI::Asset::Redirect',
@@ -104,6 +106,7 @@ is(
 #----------------------------------------------------------------------------
 # Test operation with a private Redirect through a login
 push @versionTags, WebGUI::VersionTag->getWorking( $session );
+WebGUI::Test->addToCleanup($versionTags[-1]);
 $redirect
     = $node->addChild({
         className       => 'WebGUI::Asset::Redirect',
@@ -137,6 +140,7 @@ is(
 # Test operation with a private Redirect through a login with translate 
 # query params
 push @versionTags, WebGUI::VersionTag->getWorking( $session );
+WebGUI::Test->addToCleanup($versionTags[-1]);
 $redirect
     = $node->addChild({
         className           => 'WebGUI::Asset::Redirect',
@@ -170,12 +174,4 @@ TODO: {
     );
 };
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    for my $tag ( @versionTags ) {
-        $tag->rollback;
-    }
-
-}
+#vim:ft=perl
diff --git a/t/Asset/Shortcut/000-create-delete.t b/t/Asset/Shortcut/000-create-delete.t
index cacffd9b7..812924793 100644
--- a/t/Asset/Shortcut/000-create-delete.t
+++ b/t/Asset/Shortcut/000-create-delete.t
@@ -25,6 +25,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Shortcut Test"});
+WebGUI::Test->addToCleanup($versionTag);
 
 # Make a snippet to shortcut
 my $snippet 
@@ -32,12 +33,6 @@ my $snippet
         className       => "WebGUI::Asset::Snippet",
     });
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-	$versionTag->rollback();
-}
-
 #----------------------------------------------------------------------------
 # Tests
 plan tests => 3;
diff --git a/t/Asset/Sku.t b/t/Asset/Sku.t
index e11988107..10420e541 100644
--- a/t/Asset/Sku.t
+++ b/t/Asset/Sku.t
@@ -40,6 +40,7 @@ my $sku = $root->addChild({
         title=>"Test Sku",
         });
 isa_ok($sku, "WebGUI::Asset::Sku");
+WebGUI::Test->addToCleanup($sku);
 
 $sku->addToCart;
 
@@ -83,12 +84,4 @@ $item->cart->delete;
 my $loadSku = WebGUI::Asset::Sku->newBySku($session, $sku->get("sku"));
 is($loadSku->getId, $sku->getId, "newBySku() works.");
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-$sku->purge;
-
-}
-
 1;
diff --git a/t/Asset/Sku/Ad.t b/t/Asset/Sku/Ad.t
index 5055c8e35..d6092ba45 100644
--- a/t/Asset/Sku/Ad.t
+++ b/t/Asset/Sku/Ad.t
@@ -92,6 +92,7 @@ EOCD
 15@500000
 EOID
 });
+WebGUI::Test->addToCleanup($sku);
 
 $sku->applyOptions({
       adtitle => 'Sold!',
@@ -106,11 +107,4 @@ is($sku->getPrice, '19.00', 'get Price');
 # $sku->onCompletePurchase($item);  --> not really sure how to test the rest...
 # $sku->onRefund
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $sku->purge;
-}
-
-1;
-
+#vim:ft=perl
diff --git a/t/Asset/Sku/Donation.t b/t/Asset/Sku/Donation.t
index 7e6e833d2..20c3f0d14 100644
--- a/t/Asset/Sku/Donation.t
+++ b/t/Asset/Sku/Donation.t
@@ -40,6 +40,7 @@ my $sku = $root->addChild({
         title=>"Test Donation",
         defaultPrice => 50.00,
         });
+WebGUI::Test->addToCleanup($sku);
 isa_ok($sku, "WebGUI::Asset::Sku::Donation");
 
 is($sku->getPrice, 50.00, "Price should be 50.00");
@@ -53,11 +54,4 @@ is($sku->getConfiguredTitle, "Test Donation (200)", "getConfiguredTitle()");
 
 $sku->purge;
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
-
 1;
diff --git a/t/Asset/Story.t b/t/Asset/Story.t
index 58ba198de..5c12248bc 100644
--- a/t/Asset/Story.t
+++ b/t/Asset/Story.t
@@ -442,6 +442,4 @@ cmp_bag(
 );
 
 }
-
-END {
-}
+#vim:ft=perl
diff --git a/t/Asset/Wobject/StoryArchive.t b/t/Asset/Wobject/StoryArchive.t
index 31b3e11e9..96e8c9caa 100644
--- a/t/Asset/Wobject/StoryArchive.t
+++ b/t/Asset/Wobject/StoryArchive.t
@@ -669,11 +669,7 @@ is($archive->getKeywordStaticURL('bar'), '/home/mystories/keyword_bar.html', '..
 $archive->update({ url => '/home/mystories' });
 }
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $creationDateSth->finish;
-}
+$creationDateSth->finish;
 
 sub simpleHrefParser {
 	my ($text) = @_;
diff --git a/t/Config.t b/t/Config.t
index 856b22241..af1eeacaa 100644
--- a/t/Config.t
+++ b/t/Config.t
@@ -85,8 +85,7 @@ if ($cookieName eq "") {
 }
 
 $config->set('privateArray', ['a', 'b', 'c']);
+WebGUI::Test->addToCleanup(CODE => sub { $config->delete('privateArray')});
 cmp_bag($config->get('privateArray'), ['a', 'b', 'c'], 'set: array, not scalar');
 
-END {
-    $config->delete('privateArray');
-}
+#vim:ft=perl