diff --git a/t/mojolicious/restful_lite_app.t b/t/mojolicious/restful_lite_app.t
index 3fe663acba..489d15ee60 100644
--- a/t/mojolicious/restful_lite_app.t
+++ b/t/mojolicious/restful_lite_app.t
@@ -45,351 +45,444 @@ post sub {
 
 my $t = Test::Mojo->new;
 
-# Hash without format
-$t->post_ok('/json/echo' => json => {hello => 'world'})->status_is(204)->content_is('');
+subtest 'Hash without format' => sub {
+  $t->post_ok('/json/echo' => json => {hello => 'world'})->status_is(204)->content_is('');
+};
 
-# Hash with "json" format
-$t->post_ok('/json/echo' => {Accept => 'application/json'} => json => {hello => 'world'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({hello => 'world'});
-my $tx = $t->ua->build_tx(PUT => '/json/echo' => {Accept => 'application/json'} => json => {hello => 'world'});
-$t->request_ok($tx)->status_is(200)->content_type_is('application/json;charset=UTF-8')->json_is({hello => 'world'});
+subtest 'Hash with "json" format' => sub {
+  $t->post_ok('/json/echo' => {Accept => 'application/json'} => json => {hello => 'world'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({hello => 'world'});
+  my $tx = $t->ua->build_tx(PUT => '/json/echo' => {Accept => 'application/json'} => json => {hello => 'world'});
+  $t->request_ok($tx)->status_is(200)->content_type_is('application/json;charset=UTF-8')->json_is({hello => 'world'});
+};
 
-# Array with "json" format
-$tx = $t->ua->build_tx(PUT => '/json/echo' => {Accept => 'application/json'} => json => [1, 2, 3]);
-$t->request_ok($tx)->status_is(200)->content_type_is('application/json;charset=UTF-8')->json_is([1, 2, 3]);
+subtest 'Array with "json" format' => sub {
+  my $tx = $t->ua->build_tx(PUT => '/json/echo' => {Accept => 'application/json'} => json => [1, 2, 3]);
+  $t->request_ok($tx)->status_is(200)->content_type_is('application/json;charset=UTF-8')->json_is([1, 2, 3]);
+};
 
-# Nothing
-$t->get_ok('/accepts')->status_is(200)->json_is({best => 'html'});
+subtest 'Nothing' => sub {
+  $t->get_ok('/accepts')->status_is(200)->json_is({best => 'html'});
+};
 
-# Unsupported
-$t->get_ok('/accepts.xml')->status_is(200)->json_is({best => undef});
+subtest 'Unsupported' => sub {
+  $t->get_ok('/accepts.xml')->status_is(200)->json_is({best => undef});
+};
 
-# "json" format
-$t->get_ok('/accepts.json')->status_is(200)->json_is({best => 'json'});
+subtest '"json" format' => sub {
+  $t->get_ok('/accepts.json')->status_is(200)->json_is({best => 'json'});
+};
 
-# "txt" query
-$t->get_ok('/accepts?format=txt')->status_is(200)->json_is({best => 'txt'});
+subtest '"txt" query' => sub {
+  $t->get_ok('/accepts?format=txt')->status_is(200)->json_is({best => 'txt'});
+};
 
-# Accept "txt"
-$t->get_ok('/accepts' => {Accept => 'text/plain'})->status_is(200)->json_is({best => 'txt'});
+subtest 'Accept "txt"' => sub {
+  $t->get_ok('/accepts' => {Accept => 'text/plain'})->status_is(200)->json_is({best => 'txt'});
+};
 
-# Accept "txt" with everything
-$t->get_ok('/accepts.json?format=txt' => {Accept => 'text/html'})->status_is(200)->json_is({best => 'txt'});
+subtest 'Accept "txt" with everything' => sub {
+  $t->get_ok('/accepts.json?format=txt' => {Accept => 'text/html'})->status_is(200)->json_is({best => 'txt'});
+};
 
-# Nothing
-$t->get_ok('/wants_json')->status_is(200)->json_is({wants_json => false});
+subtest 'Nothing' => sub {
+  $t->get_ok('/wants_json')->status_is(200)->json_is({wants_json => false});
+};
 
-# Unsupported
-$t->get_ok('/wants_json.xml')->status_is(200)->json_is({wants_json => false});
+subtest 'Unsupported' => sub {
+  $t->get_ok('/wants_json.xml')->status_is(200)->json_is({wants_json => false});
+};
 
-# Accept "json"
-$t->get_ok('/wants_json' => {Accept => 'application/json'})->status_is(200)->json_is({wants_json => true});
+subtest 'Accept "json"' => sub {
+  $t->get_ok('/wants_json' => {Accept => 'application/json'})->status_is(200)->json_is({wants_json => true});
+};
 
-# Ajax
-my $ajax = 'text/html;q=0.1,application/json';
-$t->get_ok('/accepts' => {Accept => $ajax, 'X-Requested-With' => 'XMLHttpRequest'})->status_is(200)
-  ->json_is({best => 'json'});
+subtest 'Ajax' => sub {
+  my $ajax = 'text/html;q=0.1,application/json';
+  $t->get_ok('/accepts' => {Accept => $ajax, 'X-Requested-With' => 'XMLHttpRequest'})->status_is(200)
+    ->json_is({best => 'json'});
+};
 
-# Nothing
-$t->get_ok('/rest')->status_is(200)->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+subtest 'Nothing' => sub {
+  $t->get_ok('/rest')->status_is(200)->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+};
 
-# "html" format
-$t->get_ok('/rest.html')->status_is(200)->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+subtest '"html" format' => sub {
+  $t->get_ok('/rest.html')->status_is(200)->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+};
 
-# Accept "html"
-$t->get_ok('/rest' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Accept "html"' => sub {
+  $t->get_ok('/rest' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# Accept "html" again
-$t->get_ok('/rest' => {Accept => 'Text/Html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Accept "html" again' => sub {
+  $t->get_ok('/rest' => {Accept => 'Text/Html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# Accept "html" with format
-$t->get_ok('/rest.html' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Accept "html" with format' => sub {
+  $t->get_ok('/rest.html' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# Accept "html" with quality
-$t->get_ok('/rest' => {Accept => 'text/html;q=9'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Accept "html" with quality' => sub {
+  $t->get_ok('/rest' => {Accept => 'text/html;q=9'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# "html" query
-$t->get_ok('/rest?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest '"html" query' => sub {
+  $t->get_ok('/rest?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# "html" format with query
-$t->get_ok('/rest.html?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest '"html" format with query' => sub {
+  $t->get_ok('/rest.html?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# Accept "html" with query
-$t->get_ok('/rest?format=html' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Accept "html" with query' => sub {
+  $t->get_ok('/rest?format=html' => {Accept => 'text/html'})->status_is(200)
+    ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+};
 
-# Accept "html" with everything
-$t->get_ok('/rest.html?format=html' => {Accept => 'text/html'})->status_is(200)
-  ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+subtest 'Accept "html" with everything' => sub {
+  $t->get_ok('/rest.html?format=html' => {Accept => 'text/html'})->status_is(200)
+    ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works');
+};
 
-# "json" format
-$t->get_ok('/rest.json')->status_is(200)->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest '"json" format' => sub {
+  $t->get_ok('/rest.json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works'});
+};
 
-# Accept "json"
-$t->get_ok('/rest' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'Accept "json"' => sub {
+  $t->get_ok('/rest' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
-# Accept "json" again
-$t->get_ok('/rest' => {Accept => 'APPLICATION/JSON'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'Accept "json" again' => sub {
+  $t->get_ok('/rest' => {Accept => 'APPLICATION/JSON'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
-# Accept "json" with format
-$t->get_ok('/rest.json' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'Accept "json" with format' => sub {
+  $t->get_ok('/rest.json' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
-# Accept "json" with quality
-$t->get_ok('/rest' => {Accept => 'application/json;q=9'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'Accept "json" with quality' => sub {
+  $t->get_ok('/rest' => {Accept => 'application/json;q=9'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
-# "json" query
-$t->get_ok('/rest?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
-  ->json_is({just => 'works'});
+subtest '"json" query' => sub {
+  $t->get_ok('/rest?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works'});
+};
 
-# "json" format with query
-$t->get_ok('/rest.json?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
-  ->json_is({just => 'works'});
+subtest '"json" format with query' => sub {
+  $t->get_ok('/rest.json?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works'});
+};
 
-# Accept "json" with query
-$t->get_ok('/rest?format=json' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'Accept "json" with query' => sub {
+  $t->get_ok('/rest?format=json' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
-# Accept "json" with everything
-$t->get_ok('/rest.json?format=json' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'Accept "json" with everything' => sub {
+  $t->get_ok('/rest.json?format=json' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
-# "xml" format
-$t->get_ok('/rest.xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works');
+subtest '"xml" format' => sub {
+  $t->get_ok('/rest.xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works');
+};
 
-# Accept "xml"
-$t->get_ok('/rest' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works');
+subtest 'Accept "xml"' => sub {
+  $t->get_ok('/rest' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works');
+};
 
-# Accept "xml" again
-$t->get_ok('/rest' => {Accept => 'APPLICATION/XML'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works');
+subtest 'Accept "xml" again' => sub {
+  $t->get_ok('/rest' => {Accept => 'APPLICATION/XML'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works');
+};
 
-# Accept "xml" with format
-$t->get_ok('/rest.xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works');
+subtest 'Accept "xml" with format' => sub {
+  $t->get_ok('/rest.xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works');
+};
 
-# Accept "xml" with quality
-$t->get_ok('/rest' => {Accept => 'application/xml;q=9'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works');
+subtest 'Accept "xml" with quality' => sub {
+  $t->get_ok('/rest' => {Accept => 'application/xml;q=9'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works');
+};
 
-# "xml" query
-$t->get_ok('/rest?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works');
+subtest '"xml" query' => sub {
+  $t->get_ok('/rest?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works');
+};
 
-# "xml" format with query
-$t->get_ok('/rest.xml?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works');
+subtest '"xml" format with query' => sub {
+  $t->get_ok('/rest.xml?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works');
+};
 
-# Accept "json" with query
-$t->get_ok('/rest?format=xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works');
+subtest 'Accept "json" with query' => sub {
+  $t->get_ok('/rest?format=xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works');
+};
 
-# Accept "json" with everything
-$t->get_ok('/rest.xml?format=xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works');
+subtest 'Accept "json" with everything' => sub {
+  $t->get_ok('/rest.xml?format=xml' => {Accept => 'application/xml'})->status_is(200)
+    ->content_type_is('application/xml')->text_is(just => 'works');
+};
 
-# Unsupported accept
-$t->get_ok('/rest' => {Accept => 'image/png'})->status_is(204)->content_is('');
+subtest 'Unsupported accept' => sub {
+  $t->get_ok('/rest' => {Accept => 'image/png'})->status_is(204)->content_is('');
+};
 
-# Nothing
-$t->post_ok('/rest')->status_is(200)->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+subtest 'Nothing' => sub {
+  $t->post_ok('/rest')->status_is(200)->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+};
 
-# "html" format
-$t->post_ok('/rest.html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest '"html" format' => sub {
+  $t->post_ok('/rest.html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# Accept "html"
-$t->post_ok('/rest' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest 'Accept "html"' => sub {
+  $t->post_ok('/rest' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# Accept "html" again
-$t->post_ok('/rest' => {Accept => 'Text/Html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest 'Accept "html" again' => sub {
+  $t->post_ok('/rest' => {Accept => 'Text/Html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# Accept "html" with format
-$t->post_ok('/rest.html' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest 'Accept "html" with format' => sub {
+  $t->post_ok('/rest.html' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# Accept "html" with quality
-$t->post_ok('/rest' => {Accept => 'text/html;q=9'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest 'Accept "html" with quality' => sub {
+  $t->post_ok('/rest' => {Accept => 'text/html;q=9'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# "html" query
-$t->post_ok('/rest?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest '"html" query' => sub {
+  $t->post_ok('/rest?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# "html" format with query
-$t->post_ok('/rest.html?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest '"html" format with query' => sub {
+  $t->post_ok('/rest.html?format=html')->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# Accept html with query
-$t->post_ok('/rest?format=html' => {Accept => 'text/html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest 'Accept html with query' => sub {
+  $t->post_ok('/rest?format=html' => {Accept => 'text/html'})->status_is(200)
+    ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+};
 
-# Accept "html" with everything
-$t->post_ok('/rest.html?format=html' => {Accept => 'text/html'})->status_is(200)
-  ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+subtest 'Accept "html" with everything' => sub {
+  $t->post_ok('/rest.html?format=html' => {Accept => 'text/html'})->status_is(200)
+    ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+};
 
-# "html" form
-$t->post_ok('/rest' => form => {format => 'html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest '"html" form' => sub {
+  $t->post_ok('/rest' => form => {format => 'html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# "html" format with form
-$t->post_ok('/rest.html' => form => {format => 'html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works too');
+subtest '"html" format with form' => sub {
+  $t->post_ok('/rest.html' => form => {format => 'html'})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works too');
+};
 
-# Accept "html" with form
-$t->post_ok('/rest' => {Accept => 'text/html'} => form => {format => 'html'})->status_is(200)
-  ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+subtest 'Accept "html" with form' => sub {
+  $t->post_ok('/rest' => {Accept => 'text/html'} => form => {format => 'html'})->status_is(200)
+    ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+};
 
-# Accept "html" with everything, form alternative
-$t->post_ok('/rest.html' => {Accept => 'text/html'} => form => {format => 'html'})->status_is(200)
-  ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+subtest 'Accept "html" with everything, form alternative' => sub {
+  $t->post_ok('/rest.html' => {Accept => 'text/html'} => form => {format => 'html'})->status_is(200)
+    ->content_type_is('text/html;charset=UTF-8')->text_is('html > body', 'works too');
+};
 
-# "json" format
-$t->post_ok('/rest.json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
-  ->json_is({just => 'works too'});
+subtest '"json" format' => sub {
+  $t->post_ok('/rest.json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works too'});
+};
 
-# Accept "json"
-$t->post_ok('/rest' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json"' => sub {
+  $t->post_ok('/rest' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# Accept "json" again
-$t->post_ok('/rest' => {Accept => 'APPLICATION/JSON'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" again' => sub {
+  $t->post_ok('/rest' => {Accept => 'APPLICATION/JSON'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# Accept "json" with format
-$t->post_ok('/rest.json' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" with format' => sub {
+  $t->post_ok('/rest.json' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# Accept "json" with quality
-$t->post_ok('/rest' => {Accept => 'application/json;q=9'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" with quality' => sub {
+  $t->post_ok('/rest' => {Accept => 'application/json;q=9'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# "json" query
-$t->post_ok('/rest?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
-  ->json_is({just => 'works too'});
+subtest '"json" query' => sub {
+  $t->post_ok('/rest?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works too'});
+};
 
-# "json" format with query
-$t->post_ok('/rest.json?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
-  ->json_is({just => 'works too'});
+subtest '"json" format with query' => sub {
+  $t->post_ok('/rest.json?format=json')->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works too'});
+};
 
-# Accept "json" with query
-$t->post_ok('/rest?format=json' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" with query' => sub {
+  $t->post_ok('/rest?format=json' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# Accept "json" with everything
-$t->post_ok('/rest.json?format=json' => {Accept => 'application/json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" with everything' => sub {
+  $t->post_ok('/rest.json?format=json' => {Accept => 'application/json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# "json" form
-$t->post_ok('/rest' => form => {format => 'json'})->status_is(200)->content_type_is('application/json;charset=UTF-8')
-  ->json_is({just => 'works too'});
+subtest '"json" form' => sub {
+  $t->post_ok('/rest' => form => {format => 'json'})->status_is(200)->content_type_is('application/json;charset=UTF-8')
+    ->json_is({just => 'works too'});
+};
 
-# "json" format with form
-$t->post_ok('/rest.json' => form => {format => 'json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest '"json" format with form' => sub {
+  $t->post_ok('/rest.json' => form => {format => 'json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# Accept "json" with form
-$t->post_ok('/rest' => {Accept => 'application/json'} => form => {format => 'json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" with form' => sub {
+  $t->post_ok('/rest' => {Accept => 'application/json'} => form => {format => 'json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# Accept "json" with everything, form alternative
-$t->post_ok('/rest.json' => {Accept => 'application/json'} => form => {format => 'json'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+subtest 'Accept "json" with everything, form alternative' => sub {
+  $t->post_ok('/rest.json' => {Accept => 'application/json'} => form => {format => 'json'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works too'});
+};
 
-# "xml" format
-$t->post_ok('/rest.xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works too');
+subtest '"xml" format' => sub {
+  $t->post_ok('/rest.xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works too');
+};
 
-# Accept "xml"
-$t->post_ok('/rest' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest 'Accept "xml"' => sub {
+  $t->post_ok('/rest' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# Accept "xml" again
-$t->post_ok('/rest' => {Accept => 'APPLICATION/XML'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest 'Accept "xml" again' => sub {
+  $t->post_ok('/rest' => {Accept => 'APPLICATION/XML'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# Accept "xml" with format
-$t->post_ok('/rest.xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest 'Accept "xml" with format' => sub {
+  $t->post_ok('/rest.xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# Accept "xml" with quality
-$t->post_ok('/rest' => {Accept => 'application/xml;q=9'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest 'Accept "xml" with quality' => sub {
+  $t->post_ok('/rest' => {Accept => 'application/xml;q=9'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# "xml" query
-$t->post_ok('/rest?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works too');
+subtest '"xml" query' => sub {
+  $t->post_ok('/rest?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works too');
+};
 
-# "xml" format with query
-$t->post_ok('/rest.xml?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works too');
+subtest '"xml" format with query' => sub {
+  $t->post_ok('/rest.xml?format=xml')->status_is(200)->content_type_is('application/xml')->text_is(just => 'works too');
+};
 
-# Accept "json" with query
-$t->post_ok('/rest?format=xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest 'Accept "json" with query' => sub {
+  $t->post_ok('/rest?format=xml' => {Accept => 'application/xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# Accept "json" with everything
-$t->post_ok('/rest.xml?format=xml' => {Accept => 'application/xml'})->status_is(200)
-  ->content_type_is('application/xml')->text_is(just => 'works too');
+subtest 'Accept "json" with everything' => sub {
+  $t->post_ok('/rest.xml?format=xml' => {Accept => 'application/xml'})->status_is(200)
+    ->content_type_is('application/xml')->text_is(just => 'works too');
+};
 
-# "xml" form
-$t->post_ok('/rest' => form => {format => 'xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest '"xml" form' => sub {
+  $t->post_ok('/rest' => form => {format => 'xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# "xml" format with form
-$t->post_ok('/rest.xml' => form => {format => 'xml'})->status_is(200)->content_type_is('application/xml')
-  ->text_is(just => 'works too');
+subtest '"xml" format with form' => sub {
+  $t->post_ok('/rest.xml' => form => {format => 'xml'})->status_is(200)->content_type_is('application/xml')
+    ->text_is(just => 'works too');
+};
 
-# Accept "json" with form
-$t->post_ok('/rest' => {Accept => 'application/xml'} => form => {format => 'xml'})->status_is(200)
-  ->content_type_is('application/xml')->text_is(just => 'works too');
+subtest 'Accept "json" with form' => sub {
+  $t->post_ok('/rest' => {Accept => 'application/xml'} => form => {format => 'xml'})->status_is(200)
+    ->content_type_is('application/xml')->text_is(just => 'works too');
+};
 
-# Accept "json" with everything, form alternative
-$t->post_ok('/rest.xml' => {Accept => 'application/xml'} => form => {format => 'xml'})->status_is(200)
-  ->content_type_is('application/xml')->text_is(just => 'works too');
+subtest 'Accept "json" with everything, form alternative' => sub {
+  $t->post_ok('/rest.xml' => {Accept => 'application/xml'} => form => {format => 'xml'})->status_is(200)
+    ->content_type_is('application/xml')->text_is(just => 'works too');
+};
 
-# Unsupported accept
-$t->post_ok('/rest' => {Accept => 'image/png'})->status_is(201)->content_type_is('text/html;charset=UTF-8')
-  ->content_is('works too');
+subtest 'Unsupported accept' => sub {
+  $t->post_ok('/rest' => {Accept => 'image/png'})->status_is(201)->content_type_is('text/html;charset=UTF-8')
+    ->content_is('works too');
+};
 
-# Unsupported everything
-$t->post_ok('/rest.png?format=jpg' => {Accept => 'image/whatever'})->status_is(201)
-  ->content_type_is('text/html;charset=UTF-8')->content_is('works too');
+subtest 'Unsupported everything' => sub {
+  $t->post_ok('/rest.png?format=jpg' => {Accept => 'image/whatever'})->status_is(201)
+    ->content_type_is('text/html;charset=UTF-8')->content_is('works too');
+};
 
-# Unsupported format
-$t->post_ok('/rest.png')->status_is(201)->content_type_is('text/html;charset=UTF-8')->content_is('works too');
+subtest 'Unsupported format' => sub {
+  $t->post_ok('/rest.png')->status_is(201)->content_type_is('text/html;charset=UTF-8')->content_is('works too');
+};
 
-# Unsupported format and query
-$t->post_ok('/rest.png?format=png')->status_is(201)->content_type_is('text/html;charset=UTF-8')
-  ->content_is('works too');
+subtest 'Unsupported format and query' => sub {
+  $t->post_ok('/rest.png?format=png')->status_is(201)->content_type_is('text/html;charset=UTF-8')
+    ->content_is('works too');
+};
 
-# Does not exist
-$t->get_ok('/nothing' => {Accept => 'image/png'})->status_is(404);
+subtest 'Does not exist' => sub {
+  $t->get_ok('/nothing' => {Accept => 'image/png'})->status_is(404);
+};
 
-# Ajax
-$ajax = 'text/html;q=0.1,application/xml';
-$t->get_ok('/rest' => {Accept => $ajax, 'X-Requested-With' => 'XMLHttpRequest'})->status_is(200)
-  ->content_type_is('application/xml')->text_is(just => 'works');
+subtest 'Ajax' => sub {
+  my $ajax = 'text/html;q=0.1,application/xml';
+  $t->get_ok('/rest' => {Accept => $ajax, 'X-Requested-With' => 'XMLHttpRequest'})->status_is(200)
+    ->content_type_is('application/xml')->text_is(just => 'works');
+};
 
-# Chrome 64
-my $chrome = 'text/html,application/xhtml+xml,application/xml;q=0.9' . ',image/webp,image/apng,*/*;q=0.8';
-$t->get_ok('/rest.html' => {Accept => $chrome})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Chrome 64' => sub {
+  my $chrome = 'text/html,application/xhtml+xml,application/xml;q=0.9' . ',image/webp,image/apng,*/*;q=0.8';
+  $t->get_ok('/rest.html' => {Accept => $chrome})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# Chrome 11 with query
-$t->get_ok('/rest?format=html' => {Accept => $chrome})->status_is(200)->content_type_is('text/html;charset=UTF-8')
-  ->text_is('html > body', 'works');
+subtest 'Chrome 11 with query' => sub {
+  my $chrome = 'text/html,application/xhtml+xml,application/xml;q=0.9' . ',image/webp,image/apng,*/*;q=0.8';
+  $t->get_ok('/rest?format=html' => {Accept => $chrome})->status_is(200)->content_type_is('text/html;charset=UTF-8')
+    ->text_is('html > body', 'works');
+};
 
-# jQuery 1.8
-my $jquery = 'application/json, text/javascript, */*; q=0.01';
-$t->get_ok('/rest' => {Accept => $jquery, 'X-Requested-With' => 'XMLHttpRequest'})->status_is(200)
-  ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+subtest 'jQuery 1.8' => sub {
+  my $jquery = 'application/json, text/javascript, */*; q=0.01';
+  $t->get_ok('/rest' => {Accept => $jquery, 'X-Requested-With' => 'XMLHttpRequest'})->status_is(200)
+    ->content_type_is('application/json;charset=UTF-8')->json_is({just => 'works'});
+};
 
 done_testing();