diff --git a/lib/WebGUI/Search/Index.pm b/lib/WebGUI/Search/Index.pm
index 12026e689..d986022df 100644
--- a/lib/WebGUI/Search/Index.pm
+++ b/lib/WebGUI/Search/Index.pm
@@ -214,7 +214,7 @@ sub setIsPublic {
 	my $self = shift;
 	my $boolean = shift;
 	my $set = $self->session->db->prepare("update assetIndex set isPublic=? where assetId=?");
-	$set->execute($boolean, $self->getId);
+	$set->execute([$boolean, $self->getId]);
 }
 
 #-------------------------------------------------------------------
diff --git a/t/Search/Index.t b/t/Search/Index.t
new file mode 100644
index 000000000..6ca61bab5
--- /dev/null
+++ b/t/Search/Index.t
@@ -0,0 +1,233 @@
+# vim:syntax=perl
+#-------------------------------------------------------------------
+# 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
+#------------------------------------------------------------------
+
+# Test the search indexer
+# 
+#
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+use Test::More;
+use Test::Deep;
+use WebGUI::Test; # Must use this before any other WebGUI modules
+use WebGUI::Session;
+
+#----------------------------------------------------------------------------
+# Init
+my $session         = WebGUI::Test->session;
+my ( $db ) = $session->quick(qw{ db });
+
+# Create an article to index
+my $article         = WebGUI::Asset->getImportNode( $session )->addChild( {
+    className       => 'WebGUI::Asset::Wobject::Article',
+    keywords        => 'keyword1,keyword2',
+    title           => 'title',
+    menuTitle       => 'menuTitle',
+} );
+
+#----------------------------------------------------------------------------
+# Tests
+
+plan tests => 16;        # Increment this number for each test you create
+
+use_ok( 'WebGUI::Search::Index' );
+
+#----------------------------------------------------------------------------
+# Test initial index creation with no synopsis and no description
+my $indexer = WebGUI::Search::Index->create( $article );
+
+ok ( my $row = $db->quickHashRef( "SELECT * FROM assetIndex WHERE assetId=?", [ $article->getId ] ),
+    "assetId exists in assetIndex"
+);
+cmp_deeply ( 
+    $row,
+    {
+        assetId         => $article->getId,
+        title           => $article->get('title'),
+        synopsis        => $row->{keywords}, # synopsis defaults to value for keywords
+        url             => $article->get('url'),
+        revisionDate    => $article->get('revisionDate'),
+        creationDate    => $article->get('creationDate'),
+        ownerUserId     => $article->get('ownerUserId'),
+        groupIdView     => $article->get('groupIdView'),
+        groupIdEdit     => $article->get('groupIdEdit'),
+        className       => ref($article),
+        isPublic        => 1, # default
+        keywords        => all( # keywords contains title, menuTitle, every part of the URL and every keyword
+            re($article->get('title')),
+            re($article->get('menuTitle')),
+            re("root"), re("import"),
+            re("keyword1"), re("keyword2"),
+        ),
+        lineage         => $article->get('lineage'),
+    },
+    "Index has correct information" 
+);
+
+#----------------------------------------------------------------------------
+# Test Index methods
+
+# getId
+is( $indexer->getId, $article->getId, "getId() returns assetId" );
+
+# setIsPublic
+$indexer->setIsPublic(0);
+is( $db->quickScalar( "SELECT isPublic FROM assetIndex WHERE assetId=?", [$article->getId] ),
+    0,
+    "setIsPublic updates database",
+);
+
+# session
+isa_ok( $indexer->session, 'WebGUI::Session', 'session returns session' );
+
+# updateSynopsis
+$indexer->updateSynopsis( "A new synopsis" );
+is( $db->quickScalar( "SELECT synopsis FROM assetIndex WHERE assetId=?", [$article->getId] ),
+    "A new synopsis",
+    "updateSynopsis updates assetIndex"
+);
+$article    = WebGUI::Asset::Wobject::Article->new( $session, $article->getId );
+isnt(
+    $article->get('synopsis'),
+    "A new synopsis",
+    "updateSynopsis does not update asset's data",
+);
+
+# addFile
+# TODO
+ 
+# addKeywords
+my $currentKeywords = $db->quickScalar( "SELECT keywords FROM assetIndex WHERE assetId=?", [$article->getId] );
+$indexer->addKeywords("shawshank");
+my $newKeywords     = $db->quickScalar( "SELECT keywords FROM assetIndex WHERE assetId=?", [$article->getId] );
+like( $newKeywords, qr{$currentKeywords}, "addKeywords keeps old keywords" );
+like( $newKeywords, qr{shawshank}, "addKeywords adds the keywords" );
+
+#----------------------------------------------------------------------------
+# Test Index updated with asset data (synopsis, no description)
+$article->update({
+    synopsis        => "This is a synopsis",
+    description     => "",
+} );
+$indexer = WebGUI::Search::Index->create( $article );
+
+ok ( my $row = $db->quickHashRef( "SELECT * FROM assetIndex WHERE assetId=?", [ $article->getId ] ),
+    "assetId exists in assetIndex"
+);
+cmp_deeply ( 
+    $row,
+    {
+        assetId         => $article->getId,
+        title           => $article->get('title'),
+        synopsis        => $article->get('synopsis'),
+        url             => $article->get('url'),
+        revisionDate    => $article->get('revisionDate'),
+        creationDate    => $article->get('creationDate'),
+        ownerUserId     => $article->get('ownerUserId'),
+        groupIdView     => $article->get('groupIdView'),
+        groupIdEdit     => $article->get('groupIdEdit'),
+        className       => ref($article),
+        isPublic        => 1, # default
+        keywords        => all( # keywords contains synopsis, title, menuTitle, every part of the URL and every keyword
+            re("This''is''a''synopsis"),
+            re($article->get('title')),
+            re($article->get('menuTitle')),
+            re("root"), re("import"),
+            re("keyword1"), re("keyword2"),
+        ),
+        lineage         => $article->get('lineage'),
+    },
+    "Index has correct information" 
+);
+
+
+#----------------------------------------------------------------------------
+# Test Index updated with asset data (no synopsis, description)
+$article->update({
+    synopsis        => "",
+    description     => "My Description",
+});
+$indexer = WebGUI::Search::Index->create( $article );
+
+ok ( my $row = $db->quickHashRef( "SELECT * FROM assetIndex WHERE assetId=?", [ $article->getId ] ),
+    "assetId exists in assetIndex"
+);
+cmp_deeply ( 
+    $row,
+    {
+        assetId         => $article->getId,
+        title           => $article->get('title'),
+        synopsis        => $article->get('description'), # synopsis defaults to description when description exists
+        url             => $article->get('url'),
+        revisionDate    => $article->get('revisionDate'),
+        creationDate    => $article->get('creationDate'),
+        ownerUserId     => $article->get('ownerUserId'),
+        groupIdView     => $article->get('groupIdView'),
+        groupIdEdit     => $article->get('groupIdEdit'),
+        className       => ref($article),
+        isPublic        => 1, # default
+        keywords        => all( # keywords contains description, title, menuTitle, every part of the URL and every keyword
+            re("Description"),
+            re($article->get('title')),
+            re($article->get('menuTitle')),
+            re("root"), re("import"),
+            re("keyword1"), re("keyword2"),
+        ),
+        lineage         => $article->get('lineage'),
+    },
+    "Index has correct information" 
+);
+
+
+#----------------------------------------------------------------------------
+# Test Index updated with asset data (synopsis and description)
+$article->update({
+    synopsis        => "This is a synopsis",
+    description     => "My Description",
+});
+$indexer = WebGUI::Search::Index->create( $article );
+
+ok ( my $row = $db->quickHashRef( "SELECT * FROM assetIndex WHERE assetId=?", [ $article->getId ] ),
+    "assetId exists in assetIndex"
+);
+cmp_deeply ( 
+    $row,
+    {
+        assetId         => $article->getId,
+        title           => $article->get('title'),
+        synopsis        => $article->get('synopsis'), # synopsis is first priority to fill this
+        url             => $article->get('url'),
+        revisionDate    => $article->get('revisionDate'),
+        creationDate    => $article->get('creationDate'),
+        ownerUserId     => $article->get('ownerUserId'),
+        groupIdView     => $article->get('groupIdView'),
+        groupIdEdit     => $article->get('groupIdEdit'),
+        className       => ref($article),
+        isPublic        => 1, # default
+        keywords        => all( # keywords contains title, menuTitle, every part of the URL and every keyword
+            re($article->get('title')),
+            re($article->get('menuTitle')),
+            re("root"), re("import"),
+            re("keyword1"), re("keyword2"),
+        ),
+        lineage         => $article->get('lineage'),
+    },
+    "Index has correct information" 
+);
+
+
+#----------------------------------------------------------------------------
+# Cleanup
+END {
+    WebGUI::VersionTag->getWorking( $session )->rollback;
+}
+#vim:ft=perl