From: Sebastian Riedel <sri@labs.kraih.com>
Date: Sat, 19 Nov 2005 05:22:00 +0000 (+0000)
Subject: Switched to Module::Install
X-Git-Tag: 5.7099_04~874
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=66741f94ac93b7ba0989db3556d0e3fe36c1be87

Switched to Module::Install
---

diff --git a/t/live/lib/Catalyst/Plugin/Test/Errors.pm b/t/lib/Catalyst/Plugin/Test/Errors.pm
similarity index 100%
rename from t/live/lib/Catalyst/Plugin/Test/Errors.pm
rename to t/lib/Catalyst/Plugin/Test/Errors.pm
diff --git a/t/live/lib/Catalyst/Plugin/Test/Headers.pm b/t/lib/Catalyst/Plugin/Test/Headers.pm
similarity index 100%
rename from t/live/lib/Catalyst/Plugin/Test/Headers.pm
rename to t/lib/Catalyst/Plugin/Test/Headers.pm
diff --git a/t/live/lib/Catalyst/Plugin/Test/Plugin.pm b/t/lib/Catalyst/Plugin/Test/Plugin.pm
similarity index 100%
rename from t/live/lib/Catalyst/Plugin/Test/Plugin.pm
rename to t/lib/Catalyst/Plugin/Test/Plugin.pm
diff --git a/t/live/lib/TestApp.pm b/t/lib/TestApp.pm
similarity index 100%
rename from t/live/lib/TestApp.pm
rename to t/lib/TestApp.pm
diff --git a/t/live/lib/TestApp/Controller/Action.pm b/t/lib/TestApp/Controller/Action.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action.pm
rename to t/lib/TestApp/Controller/Action.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Auto.pm b/t/lib/TestApp/Controller/Action/Auto.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Auto.pm
rename to t/lib/TestApp/Controller/Action/Auto.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Auto/Abort.pm b/t/lib/TestApp/Controller/Action/Auto/Abort.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Auto/Abort.pm
rename to t/lib/TestApp/Controller/Action/Auto/Abort.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Auto/Deep.pm b/t/lib/TestApp/Controller/Action/Auto/Deep.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Auto/Deep.pm
rename to t/lib/TestApp/Controller/Action/Auto/Deep.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Begin.pm b/t/lib/TestApp/Controller/Action/Begin.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Begin.pm
rename to t/lib/TestApp/Controller/Action/Begin.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Default.pm b/t/lib/TestApp/Controller/Action/Default.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Default.pm
rename to t/lib/TestApp/Controller/Action/Default.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Detach.pm b/t/lib/TestApp/Controller/Action/Detach.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Detach.pm
rename to t/lib/TestApp/Controller/Action/Detach.pm
diff --git a/t/live/lib/TestApp/Controller/Action/End.pm b/t/lib/TestApp/Controller/Action/End.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/End.pm
rename to t/lib/TestApp/Controller/Action/End.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Forward.pm b/t/lib/TestApp/Controller/Action/Forward.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Forward.pm
rename to t/lib/TestApp/Controller/Action/Forward.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Global.pm b/t/lib/TestApp/Controller/Action/Global.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Global.pm
rename to t/lib/TestApp/Controller/Action/Global.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Index.pm b/t/lib/TestApp/Controller/Action/Index.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Index.pm
rename to t/lib/TestApp/Controller/Action/Index.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Inheritance.pm b/t/lib/TestApp/Controller/Action/Inheritance.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Inheritance.pm
rename to t/lib/TestApp/Controller/Action/Inheritance.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Local.pm b/t/lib/TestApp/Controller/Action/Local.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Local.pm
rename to t/lib/TestApp/Controller/Action/Local.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Multipath.pm b/t/lib/TestApp/Controller/Action/Multipath.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Multipath.pm
rename to t/lib/TestApp/Controller/Action/Multipath.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Path.pm b/t/lib/TestApp/Controller/Action/Path.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Path.pm
rename to t/lib/TestApp/Controller/Action/Path.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Private.pm b/t/lib/TestApp/Controller/Action/Private.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Private.pm
rename to t/lib/TestApp/Controller/Action/Private.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Regexp.pm b/t/lib/TestApp/Controller/Action/Regexp.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Regexp.pm
rename to t/lib/TestApp/Controller/Action/Regexp.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Relative.pm b/t/lib/TestApp/Controller/Action/Relative.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Relative.pm
rename to t/lib/TestApp/Controller/Action/Relative.pm
diff --git a/t/live/lib/TestApp/Controller/Action/Streaming.pm b/t/lib/TestApp/Controller/Action/Streaming.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Action/Streaming.pm
rename to t/lib/TestApp/Controller/Action/Streaming.pm
diff --git a/t/live/lib/TestApp/Controller/Dump.pm b/t/lib/TestApp/Controller/Dump.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Dump.pm
rename to t/lib/TestApp/Controller/Dump.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Request/URI.pm b/t/lib/TestApp/Controller/Engine/Request/URI.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Request/URI.pm
rename to t/lib/TestApp/Controller/Engine/Request/URI.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Request/Uploads.pm b/t/lib/TestApp/Controller/Engine/Request/Uploads.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Request/Uploads.pm
rename to t/lib/TestApp/Controller/Engine/Request/Uploads.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Response/Cookies.pm b/t/lib/TestApp/Controller/Engine/Response/Cookies.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Response/Cookies.pm
rename to t/lib/TestApp/Controller/Engine/Response/Cookies.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Response/Errors.pm b/t/lib/TestApp/Controller/Engine/Response/Errors.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Response/Errors.pm
rename to t/lib/TestApp/Controller/Engine/Response/Errors.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Response/Headers.pm b/t/lib/TestApp/Controller/Engine/Response/Headers.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Response/Headers.pm
rename to t/lib/TestApp/Controller/Engine/Response/Headers.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Response/Large.pm b/t/lib/TestApp/Controller/Engine/Response/Large.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Response/Large.pm
rename to t/lib/TestApp/Controller/Engine/Response/Large.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Response/Redirect.pm b/t/lib/TestApp/Controller/Engine/Response/Redirect.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Response/Redirect.pm
rename to t/lib/TestApp/Controller/Engine/Response/Redirect.pm
diff --git a/t/live/lib/TestApp/Controller/Engine/Response/Status.pm b/t/lib/TestApp/Controller/Engine/Response/Status.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Engine/Response/Status.pm
rename to t/lib/TestApp/Controller/Engine/Response/Status.pm
diff --git a/t/live/lib/TestApp/Controller/Index.pm b/t/lib/TestApp/Controller/Index.pm
similarity index 100%
rename from t/live/lib/TestApp/Controller/Index.pm
rename to t/lib/TestApp/Controller/Index.pm
diff --git a/t/live/lib/TestApp/View/Dump.pm b/t/lib/TestApp/View/Dump.pm
similarity index 100%
rename from t/live/lib/TestApp/View/Dump.pm
rename to t/lib/TestApp/View/Dump.pm
diff --git a/t/live/lib/TestApp/View/Dump/Parameters.pm b/t/lib/TestApp/View/Dump/Parameters.pm
similarity index 100%
rename from t/live/lib/TestApp/View/Dump/Parameters.pm
rename to t/lib/TestApp/View/Dump/Parameters.pm
diff --git a/t/live/lib/TestApp/View/Dump/Request.pm b/t/lib/TestApp/View/Dump/Request.pm
similarity index 100%
rename from t/live/lib/TestApp/View/Dump/Request.pm
rename to t/lib/TestApp/View/Dump/Request.pm
diff --git a/t/live/lib/TestApp/View/Dump/Response.pm b/t/lib/TestApp/View/Dump/Response.pm
similarity index 100%
rename from t/live/lib/TestApp/View/Dump/Response.pm
rename to t/lib/TestApp/View/Dump/Response.pm
diff --git a/t/live/component/controller/action/auto.t b/t/live/component/controller/action/auto.t
deleted file mode 100644
index f99d4ad..0000000
--- a/t/live/component/controller/action/auto.t
+++ /dev/null
@@ -1,135 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 18*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-    
-    # new dispatcher:
-    # 11 wallclock secs (10.14 usr +  0.20 sys = 10.34 CPU) @ 15.18/s (n=157)
-    # old dispatcher (r1486):
-    # 11 wallclock secs (10.34 usr +  0.20 sys = 10.54 CPU) @ 13.76/s (n=145)
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-    
-sub run_tests {
-    # test auto + local method
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Auto->begin
-          TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto->one
-	  TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-    
-        ok( my $response = request('http://localhost/action/auto/one'), 'auto + local' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'one', 'Content OK' );
-    }
-    
-    # test auto + default
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Auto->begin
-          TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto->default
-	  TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-    
-        ok( my $response = request('http://localhost/action/auto/anything'), 'auto + default' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'default', 'Content OK' );
-    }
-    
-    # test auto + auto + local
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Auto::Deep->begin
-          TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto::Deep->auto
-          TestApp::Controller::Action::Auto::Deep->one
-	  TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-    
-        ok( my $response = request('http://localhost/action/auto/deep/one'), 'auto + auto + local' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'deep one', 'Content OK' );
-    }
-    
-    # test auto + auto + default
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Auto::Deep->begin
-          TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto::Deep->auto
-          TestApp::Controller::Action::Auto::Deep->default
-	  TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-    
-        ok( my $response = request('http://localhost/action/auto/deep/anything'), 'auto + auto + default' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'deep default', 'Content OK' );
-    }
-    
-    # test auto + failing auto + local + end
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Auto::Abort->begin
-          TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto::Abort->auto
-          TestApp::Controller::Action::Auto::Abort->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-    
-        ok( my $response = request('http://localhost/action/auto/abort/one'), 'auto + failing auto + local' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'abort end', 'Content OK' );
-    }
-    
-    # test auto + failing auto + default + end
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Auto::Abort->begin
-          TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto::Abort->auto
-          TestApp::Controller::Action::Auto::Abort->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-    
-        ok( my $response = request('http://localhost/action/auto/abort/anything'), 'auto + failing auto + default' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'abort end', 'Content OK' );
-    }
-}
diff --git a/t/live/component/controller/action/begin.t b/t/live/component/controller/action/begin.t
deleted file mode 100644
index ab65643..0000000
--- a/t/live/component/controller/action/begin.t
+++ /dev/null
@@ -1,53 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 7*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Begin->begin
-          TestApp::Controller::Action::Begin->default
-          TestApp::View::Dump::Request->process
-	  TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/begin'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), 'default', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Begin',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like( $response->content, qr/'Catalyst::Request'/,
-            'Content is a serialized Catalyst::Request' );
-    }
-}
diff --git a/t/live/component/controller/action/default.t b/t/live/component/controller/action/default.t
deleted file mode 100644
index 2e1d68b..0000000
--- a/t/live/component/controller/action/default.t
+++ /dev/null
@@ -1,68 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 12*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Default->begin
-          TestApp::Controller::Action::Default->default
-          TestApp::View::Dump::Request->process
-	  TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/default'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), 'default', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Default',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-
-        ok( $response = request('http://localhost/foo/bar/action'), 'Request' );
-        is( $response->code, 404, 'Invalid URI returned 404' );
-    }
-    
-    # test that args are passed properly to default
-    {
-        my $creq;
-        my $expected = [ qw/action default arg1 arg2/ ];
-        
-        ok( my $response = request('http://localhost/action/default/arg1/arg2'), 'Request' );
-        ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
-        is_deeply( $creq->{arguments}, $expected, 'Arguments ok' );
-    }
-}
diff --git a/t/live/component/controller/action/detach.t b/t/live/component/controller/action/detach.t
deleted file mode 100644
index adc5c8e..0000000
--- a/t/live/component/controller/action/detach.t
+++ /dev/null
@@ -1,100 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 18*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Detach->begin
-          TestApp::Controller::Action::Detach->one
-          TestApp::Controller::Action::Detach->two
-          TestApp::View::Dump::Request->process
-	  TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        # Test detach to chain of actions.
-        ok( my $response = request('http://localhost/action/detach/one'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/detach/one', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Detach',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-    }
-
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Detach->begin
-          TestApp::Controller::Action::Detach->path
-          TestApp::Controller::Action::Detach->two
-          TestApp::View::Dump::Request->process
-	  TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        # Test detach to chain of actions.
-        ok( my $response = request('http://localhost/action/detach/path'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/detach/path', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Detach',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-    }
-
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/detach/with_args/old'),
-            'Request with args'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content, 'new' );
-    }
-
-    {
-        ok(
-            my $response = request(
-                'http://localhost/action/detach/with_method_and_args/old'),
-            'Request with args and method'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content, 'new' );
-    }
-}
diff --git a/t/live/component/controller/action/end.t b/t/live/component/controller/action/end.t
deleted file mode 100644
index 8462170..0000000
--- a/t/live/component/controller/action/end.t
+++ /dev/null
@@ -1,54 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 7*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::End->begin
-          TestApp::Controller::Action::End->default
-          TestApp::View::Dump::Request->process
-          TestApp::Controller::Action::End->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/end'), 'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), 'default', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::End',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/forward.t b/t/live/component/controller/action/forward.t
deleted file mode 100644
index db1c8ea..0000000
--- a/t/live/component/controller/action/forward.t
+++ /dev/null
@@ -1,225 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 44 * $iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Forward->begin
-          TestApp::Controller::Action::Forward->one
-          TestApp::Controller::Action::Forward->two
-          TestApp::Controller::Action::Forward->three
-          TestApp::Controller::Action::Forward->four
-          TestApp::Controller::Action::Forward->five
-          TestApp::View::Dump::Request->process
-          TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        # Test forward to global private action
-        ok( my $response = request('http://localhost/action/forward/global'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/forward/global', 'Main Class Action' );
-
-        # Test forward to chain of actions.
-        ok( $response = request('http://localhost/action/forward/one'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/forward/one', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Forward',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Forward->begin
-          TestApp::Controller::Action::Forward->jojo
-          TestApp::Controller::Action::Forward->one
-          TestApp::Controller::Action::Forward->two
-          TestApp::Controller::Action::Forward->three
-          TestApp::Controller::Action::Forward->four
-          TestApp::Controller::Action::Forward->five
-          TestApp::View::Dump::Request->process
-          TestApp::Controller::Action::Forward->three
-          TestApp::Controller::Action::Forward->four
-          TestApp::Controller::Action::Forward->five
-          TestApp::View::Dump::Request->process
-          TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/forward/jojo'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/forward/jojo', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Forward',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/forward/with_args/old'),
-            'Request with args'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content, 'old' );
-    }
-
-    {
-        ok(
-            my $response = request(
-                'http://localhost/action/forward/with_method_and_args/old'),
-            'Request with args and method'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content, 'old' );
-    }
-
-    # test forward with embedded args
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/forward/args_embed_relative'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content, 'ok' );
-    }
-
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/forward/args_embed_absolute'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content, 'ok' );
-    }
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Relative->begin
-          TestApp::Controller::Action::Relative->relative
-          TestApp::Controller::Action::Forward->one
-          TestApp::Controller::Action::Forward->two
-          TestApp::Controller::Action::Forward->three
-          TestApp::Controller::Action::Forward->four
-          TestApp::Controller::Action::Forward->five
-          TestApp::View::Dump::Request->process
-          TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        # Test forward to chain of actions.
-        ok( my $response = request('http://localhost/action/relative/relative'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/relative/relative', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Relative',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Relative->begin
-          TestApp::Controller::Action::Relative->relative_two
-          TestApp::Controller::Action::Forward->one
-          TestApp::Controller::Action::Forward->two
-          TestApp::Controller::Action::Forward->three
-          TestApp::Controller::Action::Forward->four
-          TestApp::Controller::Action::Forward->five
-          TestApp::View::Dump::Request->process
-          TestApp->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        # Test forward to chain of actions.
-        ok(
-            my $response =
-              request('http://localhost/action/relative/relative_two'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is(
-            $response->header('X-Catalyst-Action'),
-            'action/relative/relative_two',
-            'Test Action'
-        );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Relative',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/global.t b/t/live/component/controller/action/global.t
deleted file mode 100644
index 13287a6..0000000
--- a/t/live/component/controller/action/global.t
+++ /dev/null
@@ -1,83 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 18*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        ok( my $response = request('http://localhost/action_global_one'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action_global_one', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Global',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action_global_two'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action_global_two', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Global',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action_global_three'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action_global_three', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Global',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/index.t b/t/live/component/controller/action/index.t
deleted file mode 100644
index cd4f9b0..0000000
--- a/t/live/component/controller/action/index.t
+++ /dev/null
@@ -1,100 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 20*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    # test root index
-    {
-        my @expected = qw[
-          TestApp->index
-          TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-        ok( my $response = request('http://localhost/'), 'root index' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'root index', 'root index ok' );
-        
-        ok( $response = request('http://localhost'), 'root index no slash' );
-        is( $response->content, 'root index', 'root index no slash ok' );
-    }
-    
-    # test first-level controller index
-    {
-        my @expected = qw[
-          TestApp::Controller::Index->index
-          TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-        
-        ok( my $response = request('http://localhost/index/'), 'first-level controller index' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'Index index', 'first-level controller index ok' );
-        
-        ok( $response = request('http://localhost/index'), 'first-level controller index no slash' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'Index index', 'first-level controller index no slash ok' );        
-    }    
-    
-    # test second-level controller index
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Index->begin
-          TestApp::Controller::Action::Index->index
-          TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-        
-        ok( my $response = request('http://localhost/action/index/'), 'second-level controller index' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'Action-Index index', 'second-level controller index ok' );
-        
-        ok( $response = request('http://localhost/action/index'), 'second-level controller index no slash' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, 'Action-Index index', 'second-level controller index no slash ok' );        
-    }
-    
-    # test controller default when index is present
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Index->begin
-          TestApp::Controller::Action::Index->default
-	  TestApp->end
-        ];
-    
-        my $expected = join( ", ", @expected );
-        
-        ok( my $response = request('http://localhost/action/index/foo'), 'default with index' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, "Error - TestApp::Controller::Action\n", 'default with index ok' );
-    }
-}
diff --git a/t/live/component/controller/action/inheritance.t b/t/live/component/controller/action/inheritance.t
deleted file mode 100644
index f13b0e6..0000000
--- a/t/live/component/controller/action/inheritance.t
+++ /dev/null
@@ -1,119 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 21*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Inheritance->begin
-          TestApp::Controller::Action::Inheritance->auto
-          TestApp::Controller::Action::Inheritance->default
-          TestApp::View::Dump::Request->process
-          TestApp::Controller::Action::Inheritance->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/inheritance'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), 'default', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Inheritance',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Inheritance::A->begin
-          TestApp::Controller::Action::Inheritance->auto
-          TestApp::Controller::Action::Inheritance::A->auto
-          TestApp::Controller::Action::Inheritance::A->default
-          TestApp::View::Dump::Request->process
-          TestApp::Controller::Action::Inheritance::A->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/inheritance/a'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), 'default', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Inheritance::A',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Inheritance::A::B->begin
-          TestApp::Controller::Action::Inheritance->auto
-          TestApp::Controller::Action::Inheritance::A->auto
-          TestApp::Controller::Action::Inheritance::A::B->auto
-          TestApp::Controller::Action::Inheritance::A::B->default
-          TestApp::View::Dump::Request->process
-          TestApp::Controller::Action::Inheritance::A::B->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/inheritance/a/b'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), 'default', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Inheritance::A::B',
-            'Test Class'
-        );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/local.t b/t/live/component/controller/action/local.t
deleted file mode 100644
index 1d85bee..0000000
--- a/t/live/component/controller/action/local.t
+++ /dev/null
@@ -1,105 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 24*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        ok( my $response = request('http://localhost/action/local/one'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/local/one', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Local',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/local/two'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/local/two', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Local',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/local/three'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/local/three', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Local',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/local/four/five/six'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/local/four/five/six', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Local',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/multipath.t b/t/live/component/controller/action/multipath.t
deleted file mode 100644
index faa043b..0000000
--- a/t/live/component/controller/action/multipath.t
+++ /dev/null
@@ -1,71 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-my $content = q/foo
-bar
-baz
-/;
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 16*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    # Local
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/multipath/multipath'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->content, $content, 'Content is a stream' );
-    }
-
-    # Global
-    {
-        ok( my $response = request('http://localhost/multipath'), 'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->content, $content, 'Content is a stream' );
-    }
-
-    # Path('/multipath1')
-    {
-        ok( my $response = request('http://localhost/multipath1'), 'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->content, $content, 'Content is a stream' );
-    }
-
-    # Path('multipath2')
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/multipath/multipath2'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->content, $content, 'Content is a stream' );
-    }
-}
diff --git a/t/live/component/controller/action/path.t b/t/live/component/controller/action/path.t
deleted file mode 100644
index 24aeffe..0000000
--- a/t/live/component/controller/action/path.t
+++ /dev/null
@@ -1,127 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 30*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        ok(
-            my $response =
-              request('http://localhost/action/path/a path with spaces'),
-            'Request'
-        );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is(
-            $response->header('X-Catalyst-Action'),
-            'action/path/a path with spaces',
-            'Test Action'
-        );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Path',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/path/åäö'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/path/åäö', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Path',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/path/'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/path', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Path',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/path/spaces_near_parens_singleq'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/path/spaces_near_parens_singleq', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Path',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/path/spaces_near_parens_doubleq'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            'action/path/spaces_near_parens_doubleq', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Path',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/private.t b/t/live/component/controller/action/private.t
deleted file mode 100644
index 6ca0580..0000000
--- a/t/live/component/controller/action/private.t
+++ /dev/null
@@ -1,89 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 24*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        ok( my $response = request('http://localhost/action/private/one'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Private',
-            'Test Class'
-        );
-        is( $response->content, 'access denied', 'Access' );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/private/two'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Private',
-            'Test Class'
-        );
-        is( $response->content, 'access denied', 'Access' );
-    }
-
-    {
-        ok( my $response = request('http://localhost/three'), 'Request' );
-        ok( $response->is_error, 'Response Server Error 5xx' );
-        is( $response->content_type, 'text/html', 'Response Content-Type' );
-        like(
-            $response->header('X-Catalyst-Error'),
-            qr/^Unknown resource "three"/,
-            'Catalyst Error'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/private/four'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Private',
-            'Test Class'
-        );
-        is( $response->content, 'access denied', 'Access' );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/private/five'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Private',
-            'Test Class'
-        );
-        is( $response->content, 'access denied', 'Access' );
-    }
-}
diff --git a/t/live/component/controller/action/regexp.t b/t/live/component/controller/action/regexp.t
deleted file mode 100644
index f67d0f9..0000000
--- a/t/live/component/controller/action/regexp.t
+++ /dev/null
@@ -1,64 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 12*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    {
-        ok( my $response = request('http://localhost/action/regexp/10/hello'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            '^action/regexp/(\d+)/(\w+)$', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Regexp',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-
-    {
-        ok( my $response = request('http://localhost/action/regexp/hello/10'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'),
-            '^action/regexp/(\w+)/(\d+)$', 'Test Action' );
-        is(
-            $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Regexp',
-            'Test Class'
-        );
-        like(
-            $response->content,
-            qr/^bless\( .* 'Catalyst::Request' \)$/s,
-            'Content is a serialized Catalyst::Request'
-        );
-    }
-}
diff --git a/t/live/component/controller/action/streaming.t b/t/live/component/controller/action/streaming.t
deleted file mode 100644
index c7e1c79..0000000
--- a/t/live/component/controller/action/streaming.t
+++ /dev/null
@@ -1,60 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../../../lib";
-
-our $iters;
-
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
-
-use Test::More tests => 8*$iters;
-use Catalyst::Test 'TestApp';
-
-if ( $ENV{CAT_BENCHMARK} ) {
-    require Benchmark;
-    Benchmark::timethis( $iters, \&run_tests );
-}
-else {
-    for ( 1 .. $iters ) {
-        run_tests();
-    }
-}
-
-sub run_tests {
-    # test direct streaming
-    {
-        ok( my $response = request('http://localhost/streaming'), 'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->content,, <<'EOF', 'Content is a stream' );
-foo
-bar
-baz
-EOF
-    }
-
-    # test streaming by passing a handle to $c->res->body
-  SKIP:
-    {
-        if ( $ENV{CATALYST_SERVER} ) {
-            skip "Using remote server", 4;
-        }
-
-        my $file = "$FindBin::Bin/../../../../01use.t";
-        my $fh = IO::File->new( $file, 'r' );
-        my $buffer;
-        if ( defined $fh ) {
-            $fh->read( $buffer, 1024 );
-            $fh->close;
-        }
-
-        ok( my $response = request('http://localhost/action/streaming/body'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->content, $buffer, 'Content is read from filehandle' );
-    }
-}
diff --git a/t/optional/http-server-restart.t b/t/optinal_http-server-restart.t
similarity index 100%
rename from t/optional/http-server-restart.t
rename to t/optinal_http-server-restart.t
diff --git a/t/optional/apache-cgi.pl b/t/optional_apache-cgi.pl
similarity index 100%
rename from t/optional/apache-cgi.pl
rename to t/optional_apache-cgi.pl
diff --git a/t/optional/apache-fastcgi.pl b/t/optional_apache-fastcgi.pl
similarity index 100%
rename from t/optional/apache-fastcgi.pl
rename to t/optional_apache-fastcgi.pl
diff --git a/t/optional/http-server.t b/t/optional_http-server.t
similarity index 100%
rename from t/optional/http-server.t
rename to t/optional_http-server.t
diff --git a/t/optional/memleak.t b/t/optional_memleak.t
similarity index 100%
rename from t/optional/memleak.t
rename to t/optional_memleak.t
diff --git a/t/optional/stress.t b/t/optional_stress.t
similarity index 87%
rename from t/optional/stress.t
rename to t/optional_stress.t
index f1f6b45..d9fdf56 100644
--- a/t/optional/stress.t
+++ b/t/optional_stress.t
@@ -17,7 +17,7 @@ BEGIN {
       unless $ENV{TEST_STRESS};
 
     $iters = $ENV{TEST_STRESS} || 10;
-    $tests = YAML::LoadFile("$FindBin::Bin/stress.yml");
+    $tests = YAML::LoadFile("$FindBin::Bin/optional_stress.yml");
 
     my $total_tests = 0;
     map { $total_tests += scalar @{ $tests->{$_} } } keys %{$tests};
diff --git a/t/optional/stress.yml b/t/optional_stress.yml
similarity index 100%
rename from t/optional/stress.yml
rename to t/optional_stress.yml
diff --git a/t/optional/threads.t b/t/optional_threads.t
similarity index 100%
rename from t/optional/threads.t
rename to t/optional_threads.t
diff --git a/t/unit/core/component.t b/t/unit_core_component.t
similarity index 100%
rename from t/unit/core/component.t
rename to t/unit_core_component.t
diff --git a/t/unit/core/mvc.t b/t/unit_core_mvc.t
similarity index 100%
rename from t/unit/core/mvc.t
rename to t/unit_core_mvc.t
diff --git a/t/unit/core/path_to.t b/t/unit_core_path_to.t
similarity index 100%
rename from t/unit/core/path_to.t
rename to t/unit_core_path_to.t
diff --git a/t/unit/core/uri_for.t b/t/unit_core_uri_for.t
similarity index 100%
rename from t/unit/core/uri_for.t
rename to t/unit_core_uri_for.t