diff --git a/t/tests/Test/WebGUI/Asset.pm b/t/tests/Test/WebGUI/Asset.pm
index 8d0a269e1..23c3d6366 100644
--- a/t/tests/Test/WebGUI/Asset.pm
+++ b/t/tests/Test/WebGUI/Asset.pm
@@ -195,12 +195,14 @@ sub write_update : Test(8) {
 sub keywords : Test(3) {
     my $test    = shift;
     my $session = $test->session;
-    note "keywords for ".$test->class;
+    my $tag = WebGUI::VersionTag->getWorking($session);
     my @parents = $test->getMyParents;
-    my $asset  = $parents[-1]->addChild({
+    my $asset   = $parents[-1]->addChild({
         className => $test->class,
     }, undef, undef, {skipNotification => 1, skipAutoCommitWorkflows => 1,});
     addToCleanup($asset);
+    $tag->commit;
+    addToCleanup($tag);
     can_ok $asset, 'keywords';
     $asset->keywords('chess set');
     is $asset->keywords, 'chess set', 'set and get of keywords via direct accessor';
diff --git a/t/tests/Test/WebGUI/Asset/MapPoint.pm b/t/tests/Test/WebGUI/Asset/MapPoint.pm
new file mode 100644
index 000000000..c0ef38dfa
--- /dev/null
+++ b/t/tests/Test/WebGUI/Asset/MapPoint.pm
@@ -0,0 +1,27 @@
+package Test::WebGUI::Asset::MapPoint;
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+
+use base qw/Test::WebGUI::Asset/;
+
+use Test::More;
+use Test::Deep;
+use Test::Exception;
+
+sub list_of_tables {
+     return [qw/assetData MapPoint/];
+}
+
+sub parent_list {
+    return ['WebGUI::Asset::Wobject::Map'];
+}
+
+1;