diff --git a/t/Asset/dispatch.t b/t/Asset/dispatch.t
new file mode 100644
index 000000000..4319296d9
--- /dev/null
+++ b/t/Asset/dispatch.t
@@ -0,0 +1,78 @@
+# 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 asset dispatch system
+# 
+#
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/lib";
+use Test::More;
+use WebGUI::Test; # Must use this before any other WebGUI modules
+use WebGUI::Session;
+
+#----------------------------------------------------------------------------
+# Init
+my $session         = WebGUI::Test->session;
+
+$INC{'WebGUI::Asset::TestDispatch'} = __FILE__;
+
+package WebGUI::Asset::TestDispatch;
+
+our @ISA = ('WebGUI::Asset');
+
+# Override dispatch to handle special /foo URL
+sub dispatch {
+    my ( $self, $fragment ) = @_;
+
+    if ( $fragment eq '/foo' ) {
+        return "bar";
+    }
+
+    return $self->SUPER::dispatch( $fragment );
+}
+
+sub www_view {
+    return "www_view";
+}
+
+sub www_edit {
+    return "www_edit";
+}
+
+package main;
+
+my $tag = WebGUI::VersionTag->getWorking( $session );
+WebGUI::Test->addToCleanup( $tag );
+
+#----------------------------------------------------------------------------
+# Tests
+
+plan tests => 4;        # Increment this number for each test you create
+
+#----------------------------------------------------------------------------
+# Test dispatch
+
+# Add a TestDispatch asset and test
+my $td  = WebGUI::Asset->getImportNode( $session )->addChild( { className => 'WebGUI::Asset::TestDispatch' } );
+is( $td->dispatch, "www_view", "dispatch with no fragment shows www_view" );
+is( $td->dispatch( '/foo' ), 'bar', 'dispatch detects fragment and returns' );
+ok( !$td->dispatch( '/unhandled' ), 'dispatch with unknown fragment returns false' );
+
+# Test func=
+$session->request->setup_body( {
+    func        => 'edit',
+} );
+is( $td->dispatch, "www_edit", "dispatch handles ?func= query param" );
+
+
+#vim:ft=perl
diff --git a/t/Content/Asset.t b/t/Content/Asset.t
new file mode 100644
index 000000000..080806ffb
--- /dev/null
+++ b/t/Content/Asset.t
@@ -0,0 +1,121 @@
+# 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
+#------------------------------------------------------------------
+
+# Write a little about what this script tests.
+# 
+#
+
+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;
+
+$INC{'WebGUI::Asset::TestDispatch'} = __FILE__;
+
+package WebGUI::Asset::TestDispatch;
+
+our @ISA = ('WebGUI::Asset');
+
+# Override dispatch to handle special /foo URL
+sub dispatch {
+    my ( $self, $fragment ) = @_;
+
+    if ( $fragment eq '/foo' ) {
+        return "bar";
+    }
+
+    return $self->SUPER::dispatch( $fragment );
+}
+
+sub www_view {
+    my ( $self ) = @_;
+    return "www_view " . $self->get('title');
+}
+
+package main;
+
+my $td
+    = WebGUI::Asset->getImportNode( $session )->addChild( {
+        title           => "one",
+        className       => 'WebGUI::Asset::TestDispatch',
+        url             => 'testdispatch',
+    } );
+
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
+
+#----------------------------------------------------------------------------
+# Tests
+
+plan tests => 8;        # Increment this number for each test you create
+
+#----------------------------------------------------------------------------
+# test getUrlPermutation( url ) method
+
+cmp_deeply( 
+    WebGUI::Content::Asset::getUrlPermutations( ),
+    [ ],
+    "Handles no URL gracefully",
+);
+cmp_deeply( 
+    WebGUI::Content::Asset::getUrlPermutation( "one" ),
+    [ 'one' ],
+);
+cmp_deeply(
+    WebGUI::Content::Asset::getUrlPermutation( "/one" ),
+    [ '/one', ],
+);
+cmp_deeply(
+    WebGUI::Content::Asset::getUrlPermutation( "/one/two/three" ),
+    [ '/one/two/three', '/one/two', '/one', ],
+);
+cmp_deeply(
+    WebGUI::Content::Asset::getUrlPermutation( "/one/two/three.rss" ),
+    [ '/one/two/three.rss', '/one/two/three', '/one/two', '/one', ],
+    ".ext is a seperate URL permutation",
+);
+
+
+#----------------------------------------------------------------------------
+# test dispatch( session, url ) method
+is(
+    WebGUI::Content::Asset::dispatch( $session, "testdispatch" ),
+    "www_view one",
+    "Regular www_view",
+);
+
+is(
+    WebGUI::Content::Asset::dispatch( $session, "testdispatch/foo" ),
+    "bar",
+    "special /foo handler",
+);
+
+# Add an asset that clobbers the TestDispatch's /foo
+my $clobberingTime
+    = WebGUI::Asset->getImportNode( $session )->addChild( {
+        title       => "two",
+        className   => 'WebGUI::Asset::TestDispatch',
+        url         => $td->get('url') . '/foo',
+    } );
+
+is(
+    WebGUI::Content::Asset::dispatch( $session, "testdispatch/foo" ),
+    "www_view two",
+    "dispatch to the asset with the longest URL",
+);
+
+#vim:ft=perl