diff --git a/t/Asset/File/GalleryFile/Photo/view.t b/t/Asset/File/GalleryFile/Photo/view.t
index ce69fe412..a16763c69 100644
--- a/t/Asset/File/GalleryFile/Photo/view.t
+++ b/t/Asset/File/GalleryFile/Photo/view.t
@@ -128,9 +128,6 @@ my $testTemplateVars    = {
     lastFile_thumbnailUrl 
         => $nextPhoto->getThumbnailUrl,    
     lastFile_title      => $nextPhoto->get("title"),
-    ownerAlias          => 'Admin',
-    ownerId             => '3',
-    ownerProfileUrl     => '/?op=account;module=profile;do=view;uid=3',
 };
 
 # Ignore all EXIF tags, they're tested in exif.t
diff --git a/t/Asset/Story.t b/t/Asset/Story.t
index ab43dd049..c2203edc5 100644
--- a/t/Asset/Story.t
+++ b/t/Asset/Story.t
@@ -274,11 +274,9 @@ cmp_deeply(
     {
         title       => 'Story 1',
         description => 'WebGUI was originally called Web Done Right.',
-        'link'      => all(re('^'.$session->url->getSiteURL),re('story-1$')),
-        guid        => re('story-1$'),
+        'link'      => re('story-1$'),
         author      => 'JT Smith',
         date        => $story->lastModified,
-        pubDate     => $session->datetime->epochToMail($story->get('creationDate')),
     },
     'getRssData: returns correct data'
 );
diff --git a/t/Asset/Wobject/StoryArchive.t b/t/Asset/Wobject/StoryArchive.t
index 9b569684a..6099616a6 100644
--- a/t/Asset/Wobject/StoryArchive.t
+++ b/t/Asset/Wobject/StoryArchive.t
@@ -548,8 +548,6 @@ cmp_deeply(
             'link'      => ignore(),
             date        => ignore(),
             author      => ignore(),
-            pubDate     => ignore(),
-            guid        => ignore(),
         },
         {
             title => 'Story 2',
@@ -557,8 +555,6 @@ cmp_deeply(
             'link'      => ignore(),
             date        => ignore(),
             author      => ignore(),
-            pubDate     => ignore(),
-            guid        => ignore(),
         },
         {
             title => 'Story 3',
@@ -566,8 +562,6 @@ cmp_deeply(
             'link'      => ignore(),
             date        => ignore(),
             author      => ignore(),
-            pubDate     => ignore(),
-            guid        => ignore(),
         },
     ],
     'rssFeedItems'
diff --git a/t/Asset/Wobject/StoryTopic.t b/t/Asset/Wobject/StoryTopic.t
index 5db164256..cfbfb6134 100644
--- a/t/Asset/Wobject/StoryTopic.t
+++ b/t/Asset/Wobject/StoryTopic.t
@@ -297,8 +297,6 @@ cmp_deeply(
             'link'      => ignore(),
             date        => ignore(),
             author      => ignore(),
-            pubDate     => ignore(),
-            guid        => ignore(),
         },
         {
             title => 'red',
@@ -306,8 +304,6 @@ cmp_deeply(
             'link'      => ignore(),
             date        => ignore(),
             author      => ignore(),
-            pubDate     => ignore(),
-            guid        => ignore(),
         },
         {
             title => 'brooks',
@@ -315,8 +311,6 @@ cmp_deeply(
             'link'      => ignore(),
             date        => ignore(),
             author      => ignore(),
-            pubDate     => ignore(),
-            guid        => ignore(),
         },
     ],
     'rssFeedItems'
diff --git a/t/Macro/PickLanguage.t b/t/Macro/PickLanguage.t
index c95137cf3..cb2bfa70a 100644
--- a/t/Macro/PickLanguage.t
+++ b/t/Macro/PickLanguage.t
@@ -54,7 +54,6 @@ $templateMock->mock('process', sub { $templateVars = $_[1]; } );
                               'language_langAbbr' => 'en',
                               'language_langAbbrLoc' => 'US',
                               'language_langEng' => 'English',
-                              'language_isCurrent' => '1',
                       },
               ],
 		delete_url 	=> '?op=setLanguage;language=delete;',
@@ -83,7 +82,6 @@ $templateMock->mock('process', sub { $templateVars = $_[1]; } );
                               'language_langAbbr' => 'en',
                               'language_langAbbrLoc' => 'US',
                               'language_langEng' => 'English',
-                              'language_isCurrent' => '1',
                       },
               ],
 			delete_url => '?op=setLanguage;language=delete;',
diff --git a/t/Storage.t b/t/Storage.t
index 1fdb66d78..d44293c44 100644
--- a/t/Storage.t
+++ b/t/Storage.t
@@ -68,8 +68,8 @@ is( $storage1->getLastError, undef, "No errors during path creation");
 #
 ####################################################
 
-is( $storage1->getPathFrag,    '7e/8a/7e8a1b6ab', 'pathFrag returns correct value');
-is( $storage1->getDirectoryId, '7e8a1b6ab',       'getDirectoryId returns the last path element');
+is( $storage1->getPathFrag,    '7e/8a/7e8a1b6a', 'pathFrag returns correct value');
+is( $storage1->getDirectoryId, '7e8a1b6a',       'getDirectoryId returns the last path element');
 
 ##Build an old-style GUID storage location
 my $uploadsBase = Path::Class::Dir->new($uploadDir);
@@ -94,12 +94,12 @@ is($guidStorage->getDirectoryId, $newGuid, '... getDirectoryId');
 $session->config->delete('cdn');
 # Note: the CDN configuration will be reverted after CDN tests below
 
-my $storageDir1 = join '/', $uploadDir, '7e', '8a', '7e8a1b6ab';
+my $storageDir1 = join '/', $uploadDir, '7e', '8a', '7e8a1b6a';
 is ($storage1->getPath, $storageDir1, 'getPath: path calculated correctly for directory');
 my $storageFile1 = join '/', $storageDir1, 'baz';
 is ($storage1->getPath('baz'), $storageFile1, 'getPath: path calculated correctly for file');
 
-my $storageUrl1 = join '/', $uploadUrl, '7e', '8a', '7e8a1b6ab';
+my $storageUrl1 = join '/', $uploadUrl, '7e', '8a', '7e8a1b6a';
 is ($storage1->getUrl, $storageUrl1, 'getUrl: url calculated correctly for directory');
 my $storageUrl2 = join '/', $storageUrl1, 'bar';
 is ($storage1->getUrl('bar'), $storageUrl2, 'getUrl: url calculated correctly for file');
diff --git a/t/tests/Test/WebGUI/Asset.pm b/t/tests/Test/WebGUI/Asset.pm
index 2951b1473..70b6d5916 100644
--- a/t/tests/Test/WebGUI/Asset.pm
+++ b/t/tests/Test/WebGUI/Asset.pm
@@ -42,7 +42,6 @@ sub getAnchoredAsset {
         $a = $a->cloneFromDb;
     }
     WebGUI::Test->addToCleanup($tag);
-    warn "returning data";
     return ($tag, $asset, @parents);
 }
 
@@ -274,7 +273,6 @@ sub t_05_cut_paste : Test(5) {
     my $session = $test->session;
     my ($tag, $asset, @parents) = $test->getAnchoredAsset();
     ok $asset->cut, 'cut returns true if it was cut';
-    ok $asset->cut, 'cut returns true if it was cut';
     is $asset->state, 'clipboard', 'asset state updated';
     my $session_asset = $session->asset();
     $session->asset($parents[-1]);