diff --git a/t/Asset/File/Image/Photo/ajax.t b/t/Asset/File/Image/Photo/ajax.t
index cf1ebbe72..e14c08f3e 100644
--- a/t/Asset/File/Image/Photo/ajax.t
+++ b/t/Asset/File/Image/Photo/ajax.t
@@ -30,11 +30,11 @@ $versionTag->set({name=>"Photo Test"});
 my $maker           = WebGUI::Test::Maker::HTML->new;
 my $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
     });
 my $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 my $photo
     = $gallery->addChild({
@@ -49,5 +49,5 @@ END {
 
 #----------------------------------------------------------------------------
 # Tests
-plan tests => 0;
+plan tests => 1;
 
diff --git a/t/Asset/File/Image/Photo/comment.t b/t/Asset/File/Image/Photo/comment.t
index 0430b4b86..70e902e8e 100644
--- a/t/Asset/File/Image/Photo/comment.t
+++ b/t/Asset/File/Image/Photo/comment.t
@@ -29,12 +29,12 @@ my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Photo Test"});
 my $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
         groupIdAddComment   => "2",
     });
 my $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 my $photo
     = $album->addChild({
@@ -49,7 +49,7 @@ END {
 
 #----------------------------------------------------------------------------
 # Tests
-plan tests => 0;
+plan tests => 1;
 
 #----------------------------------------------------------------------------
 # Test with no comments
@@ -248,3 +248,4 @@ is(
     scalar @$ids, 1, 
     "www_addCommentSave -- Comment was added",
 );
+
diff --git a/t/Asset/File/Image/Photo/delete.t b/t/Asset/File/Image/Photo/delete.t
index 2afc39ad6..47c40a2f2 100644
--- a/t/Asset/File/Image/Photo/delete.t
+++ b/t/Asset/File/Image/Photo/delete.t
@@ -31,11 +31,11 @@ $versionTag->set({name=>"Photo Test"});
 my $maker           = WebGUI::Test::Maker::HTML->new;
 my $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
     });
 my $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 my $photo
     = $gallery->addChild({
@@ -50,4 +50,4 @@ END {
 
 #----------------------------------------------------------------------------
 # Tests
-plan tests => 0;
+plan tests => 1;
diff --git a/t/Asset/File/Image/Photo/download.t b/t/Asset/File/Image/Photo/download.t
index 6744b8c5a..167689917 100644
--- a/t/Asset/File/Image/Photo/download.t
+++ b/t/Asset/File/Image/Photo/download.t
@@ -30,11 +30,11 @@ $versionTag->set({name=>"Photo Test"});
 my $maker           = WebGUI::Test::Maker::HTML->new;
 my $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
     });
 my $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 my $photo
     = $gallery->addChild({
@@ -49,4 +49,4 @@ END {
 
 #----------------------------------------------------------------------------
 # Tests
-plan tests => 0;
+plan tests => 1;
diff --git a/t/Asset/File/Image/Photo/makeResolutions.t b/t/Asset/File/Image/Photo/makeResolutions.t
index 7d7c4744a..92110a97b 100644
--- a/t/Asset/File/Image/Photo/makeResolutions.t
+++ b/t/Asset/File/Image/Photo/makeResolutions.t
@@ -135,12 +135,12 @@ $photo->getStorageLocation->addFileFromFilesystem( WebGUI::Test->getTestCollater
 # makeResolutions gets default resolutions from a parent Photo Gallery asset
 $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
         imageResolutions    => "1600x1200\n1024x768\n800x600\n640x480",
     });
 $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 $photo
     = $album->addChild({
@@ -168,12 +168,12 @@ TODO: {
 # parent asset
 $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
         imageResolutions    => "1600x1200\n1024x768\n800x600\n640x480",
     });
 $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 $photo
     = $album->addChild({
diff --git a/t/Asset/File/Image/Photo/makeShortcut.t b/t/Asset/File/Image/Photo/makeShortcut.t
index adbb7dd75..efa051fcb 100644
--- a/t/Asset/File/Image/Photo/makeShortcut.t
+++ b/t/Asset/File/Image/Photo/makeShortcut.t
@@ -47,7 +47,7 @@ END {
 
 #----------------------------------------------------------------------------
 # Tests
-plan tests => 0;
+plan tests => 1;
 
 #----------------------------------------------------------------------------
 # makeShortcut argument checking
diff --git a/t/Asset/File/Image/Photo/setFile.t b/t/Asset/File/Image/Photo/setFile.t
index 9a0895ca5..652f41a52 100644
--- a/t/Asset/File/Image/Photo/setFile.t
+++ b/t/Asset/File/Image/Photo/setFile.t
@@ -28,12 +28,12 @@ my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Photo Test"});
 my $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
         imageResolutions    => "1024x768",
     });
 my $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 my $photo
     = $album->addChild({
diff --git a/t/Asset/File/Image/Photo/view.t b/t/Asset/File/Image/Photo/view.t
index 6a7c81588..5511e529f 100644
--- a/t/Asset/File/Image/Photo/view.t
+++ b/t/Asset/File/Image/Photo/view.t
@@ -30,11 +30,11 @@ $versionTag->set({name=>"Photo Test"});
 my $maker           = WebGUI::Test::Maker::HTML->new;
 my $gallery
     = $node->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoGallery",
+        className           => "WebGUI::Asset::Wobject::Gallery",
     });
 my $album
     = $gallery->addChild({
-        className           => "WebGUI::Asset::Wobject::PhotoAlbum",
+        className           => "WebGUI::Asset::Wobject::GalleryAlbum",
     });
 my $photo
     = $gallery->addChild({
@@ -50,4 +50,4 @@ END {
 
 #----------------------------------------------------------------------------
 # Tests
-plan tests => 0;
+plan tests => 1;