diff --git a/t/Asset/Shortcut/010-linked-asset.t b/t/Asset/Shortcut/010-linked-asset.t
index cb631ab38..5ae832689 100644
--- a/t/Asset/Shortcut/010-linked-asset.t
+++ b/t/Asset/Shortcut/010-linked-asset.t
@@ -28,6 +28,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Shortcut Test"});
+addToCleanup;
 
 # Make a snippet to shortcut
 my $snippet 
@@ -41,12 +42,6 @@ my $shortcut
         shortcutToAssetId   => $snippet->getId,
     });
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-	$versionTag->rollback();
-}
-
 
 #----------------------------------------------------------------------------
 # Tests
@@ -74,7 +69,7 @@ is(
 #----------------------------------------------------------------------------
 # Test trashing snippet trashes shortcut also
 $snippet->trash;
-$shortcut   = WebGUI::Asset->newByDynamicClass($session, $shortcut->getId);
+$shortcut   = WebGUI::Asset->newById($session, $shortcut->getId);
 
 ok(
     defined $shortcut,