diff --git a/.gitignore b/.gitignore
index d995b07..dcae6a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-.build
-HTTP-Tiny-Mech-*
+/.build
+/HTTP-Tiny-Mech-*
+/tmp/
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a361980
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+# git help shortlog
+<kentnl@cpan.org> <kentfredric@gmail.com>
diff --git a/.travis.yml b/.travis.yml
index 38a6708..af9ef6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,56 +1,58 @@
-language: perl
-matrix:
-  allow_failures:
-    - perl: "5.8"
-    - env: STERILIZE_ENV=0 RELEASE_TESTING=1 AUTHOR_TESTING=1
-    - env: STERILIZE_ENV=0 DEVELOPER_DEPS=1
-  include:
-    - perl: "5.8"
-      env:  STERILIZE_ENV=0
-    - perl: "5.10"
-      env:  STERILIZE_ENV=0
-    - perl: "5.12"
-      env:  STERILIZE_ENV=0
-    - perl: "5.14"
-      env:  STERILIZE_ENV=0
-    - perl: "5.16"
-      env:  STERILIZE_ENV=0
-    - perl: "5.20"
-      env:  STERILIZE_ENV=0
-    - perl: "5.21"
-      env:  STERILIZE_ENV=0
-    - perl: "5.8"
-      env:  STERILIZE_ENV=1
-    - perl: "5.10"
-      env:  STERILIZE_ENV=1
-    - perl: "5.20"
-      env:  STERILIZE_ENV=1
-    - perl: "5.21"
-      env:  STERILIZE_ENV=1
-    - perl: "5.21"
-      env: STERILIZE_ENV=0 DEVELOPER_DEPS=1
-    - perl: "5.21"
-      env: STERILIZE_ENV=0 RELEASE_TESTING=1 AUTHOR_TESTING=1
-    - perl: "5.21"
-      env: STERILIZE_ENV=0 COVERAGE_TESTING=1
+---
+after_failure:
+  - perl ./maint-travis-ci/report_fail_ctx.pl
 before_install:
   - perlbrew list
   - time git clone --depth 10 https://github.com/kentfredric/travis-scripts.git maint-travis-ci
   - time git -C ./maint-travis-ci reset --hard master
   - time perl ./maint-travis-ci/branch_reset.pl
   - time perl ./maint-travis-ci/sterilize_env.pl
-install:
-  - time perl ./maint-travis-ci/install_deps_early.pl
-  - time perl ./maint-travis-ci/install_deps.pl
 before_script:
   - time perl ./maint-travis-ci/before_script.pl
-script:
-  - time perl ./maint-travis-ci/script.pl
-after_failure:
-  - perl ./maint-travis-ci/report_fail_ctx.pl
 branches:
   only:
-    - "master"
-    - "build/master"
-    - "releases"
-
+    - master
+    - builds
+    - releases
+install:
+  - time perl ./maint-travis-ci/install_deps_early.pl
+  - time perl ./maint-travis-ci/autoinstall_dzil.pl
+  - time perl ./maint-travis-ci/install_deps_2.pl
+language: perl
+matrix:
+  allow_failures:
+    - perl: '5.8'
+    - env: STERILIZE_ENV=0 RELEASE_TESTING=1 AUTHOR_TESTING=1
+    - env: STERILIZE_ENV=0 DEVELOPER_DEPS=1
+  include:
+    - env: STERILIZE_ENV=0 COVERAGE_TESTING=1
+      perl: '5.21'
+    - env: STERILIZE_ENV=1
+      perl: '5.21'
+    - env: STERILIZE_ENV=0
+      perl: '5.8'
+    - env: STERILIZE_ENV=0
+      perl: '5.10'
+    - env: STERILIZE_ENV=0
+      perl: '5.12'
+    - env: STERILIZE_ENV=0
+      perl: '5.14'
+    - env: STERILIZE_ENV=0
+      perl: '5.16'
+    - env: STERILIZE_ENV=0
+      perl: '5.20'
+    - env: STERILIZE_ENV=0
+      perl: '5.21'
+    - env: STERILIZE_ENV=1
+      perl: '5.8'
+    - env: STERILIZE_ENV=1
+      perl: '5.10'
+    - env: STERILIZE_ENV=1
+      perl: '5.20'
+    - env: STERILIZE_ENV=0 DEVELOPER_DEPS=1
+      perl: '5.21'
+    - env: STERILIZE_ENV=0 RELEASE_TESTING=1 AUTHOR_TESTING=1
+      perl: '5.21'
+script:
+  - time perl ./maint-travis-ci/script.pl
+sudo: false
diff --git a/Changes b/Changes
index c1ac63b..0ba1ad0 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,16 @@
 Release history for HTTP-Tiny-Mech
 
+1.001002 2017-03-10T13:22:58Z 91e962a
+ - Bugfix: Avoid test failures with -Ddefault_inc_excludes_dot
+ - Minor test refactoring
+ - Added compat for older Test::More
+
+ [Dependencies::Stats]
+ - Dependencies changed since 1.001001, see misc/*.deps* for details
+ - configure: +1 (recommends: ↑1)
+ - develop: +14 ↑4 -3 (recommends: +1, suggests: ↑2)
+ - test: +2 ↓1 (recommends: ↑1 ↓1)
+
 1.001001 2014-08-15T06:11:34Z
  [00 Trivial]
  - no code changes.
@@ -158,4 +169,3 @@ Release history for HTTP-Tiny-Mech
 
 0.1.0 2011-10-17T03:44:31Z
  - First version.
-
diff --git a/LICENSE b/LICENSE
index df1fb1e..42cb978 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is copyright (c) 2014 by Kent Fredric <kentnl@cpan.org>.
+This software is copyright (c) 2017 by Kent Fredric <kentnl@cpan.org>.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"
 
 --- The GNU General Public License, Version 1, February 1989 ---
 
-This software is Copyright (c) 2014 by Kent Fredric <kentnl@cpan.org>.
+This software is Copyright (c) 2017 by Kent Fredric <kentnl@cpan.org>.
 
 This is free software, licensed under:
 
@@ -272,7 +272,7 @@ That's all there is to it!
 
 --- The Artistic License 1.0 ---
 
-This software is Copyright (c) 2014 by Kent Fredric <kentnl@cpan.org>.
+This software is Copyright (c) 2017 by Kent Fredric <kentnl@cpan.org>.
 
 This is free software, licensed under:
 
diff --git a/MANIFEST b/MANIFEST
index 362e9b7..dac438c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,6 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.009.
 .gitignore
+.mailmap
 .perltidyrc
 .travis.yml
 Changes
@@ -17,6 +18,7 @@ misc/Changes.deps
 misc/Changes.deps.all
 misc/Changes.deps.dev
 misc/Changes.deps.opt
+misc/built_with.json
 misc/perlcritic.deps
 perlcritic.rc
 t/00-compile/lib_HTTP_Tiny_Mech_pm.t
@@ -24,12 +26,15 @@ t/00-report-prereqs.dd
 t/00-report-prereqs.t
 t/basic.t
 t/get.t
+t/get/FakeUA.pm
+t/mech-params.t
+t/tiny-params.t
 weaver.ini
 xt/author/critic.t
+xt/author/eol.t
+xt/author/pod-coverage.t
+xt/author/pod-syntax.t
 xt/release/cpan-changes.t
 xt/release/distmeta.t
-xt/release/eol.t
 xt/release/kwalitee.t
 xt/release/minimum-version.t
-xt/release/pod-coverage.t
-xt/release/pod-syntax.t
diff --git a/META.json b/META.json
index 3e6dfc4..8284e30 100644
--- a/META.json
+++ b/META.json
@@ -4,38 +4,44 @@
       "Kent Fredric <kentnl@cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060",
+   "generated_by" : "Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "perl_5"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "HTTP-Tiny-Mech",
    "prereqs" : {
       "configure" : {
          "recommends" : {
-            "ExtUtils::MakeMaker" : "6.98"
+            "ExtUtils::MakeMaker" : "7.00"
          },
          "requires" : {
-            "ExtUtils::MakeMaker" : "0"
+            "ExtUtils::MakeMaker" : "0",
+            "perl" : "5.006"
          }
       },
       "develop" : {
+         "recommends" : {
+            "Test::More" : "0.99"
+         },
          "requires" : {
+            "Dist::Zilla" : "5",
+            "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.004002",
+            "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002",
             "Dist::Zilla::Plugin::Authority" : "1.006",
             "Dist::Zilla::Plugin::AutoPrereqs" : "0",
             "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0",
             "Dist::Zilla::Plugin::ConfirmRelease" : "0",
             "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0",
-            "Dist::Zilla::Plugin::EOLTests" : "0",
             "Dist::Zilla::Plugin::Git::Check" : "0",
             "Dist::Zilla::Plugin::Git::Commit" : "0",
             "Dist::Zilla::Plugin::Git::CommitBuild" : "0",
             "Dist::Zilla::Plugin::Git::Contributors" : "0.006",
             "Dist::Zilla::Plugin::Git::GatherDir" : "0",
-            "Dist::Zilla::Plugin::Git::NextRelease" : "0",
+            "Dist::Zilla::Plugin::Git::NextRelease" : "0.004000",
             "Dist::Zilla::Plugin::Git::Tag" : "0",
             "Dist::Zilla::Plugin::GithubMeta" : "0",
             "Dist::Zilla::Plugin::License" : "0",
@@ -43,23 +49,27 @@
             "Dist::Zilla::Plugin::Manifest" : "0",
             "Dist::Zilla::Plugin::ManifestSkip" : "0",
             "Dist::Zilla::Plugin::MetaConfig" : "0",
-            "Dist::Zilla::Plugin::MetaData::BuiltWith" : "0",
+            "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004000",
             "Dist::Zilla::Plugin::MetaJSON" : "0",
             "Dist::Zilla::Plugin::MetaProvides::Package" : "1.14000001",
             "Dist::Zilla::Plugin::MetaTests" : "0",
-            "Dist::Zilla::Plugin::MetaYAML" : "0",
+            "Dist::Zilla::Plugin::MetaYAML::Minimal" : "0",
             "Dist::Zilla::Plugin::MinimumPerl" : "0",
             "Dist::Zilla::Plugin::PodCoverageTests" : "0",
             "Dist::Zilla::Plugin::PodSyntaxTests" : "0",
             "Dist::Zilla::Plugin::PodWeaver" : "0",
             "Dist::Zilla::Plugin::Prereqs" : "0",
+            "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0",
             "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0",
+            "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0",
+            "Dist::Zilla::Plugin::Readme::Brief" : "0",
             "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0",
-            "Dist::Zilla::Plugin::ReadmeFromPod" : "0",
+            "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0",
             "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0",
             "Dist::Zilla::Plugin::RunExtraTests" : "0",
             "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0",
-            "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0",
+            "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.003902",
+            "Dist::Zilla::Plugin::Test::EOL" : "0",
             "Dist::Zilla::Plugin::Test::Kwalitee" : "0",
             "Dist::Zilla::Plugin::Test::MinimumVersion" : "0",
             "Dist::Zilla::Plugin::Test::Perl::Critic" : "0",
@@ -67,16 +77,21 @@
             "Dist::Zilla::Plugin::TestRelease" : "0",
             "Dist::Zilla::Plugin::Twitter" : "0",
             "Dist::Zilla::Plugin::UploadToCPAN" : "0",
+            "English" : "0",
             "Pod::Coverage::TrustPod" : "0",
+            "Software::License::Perl_5" : "0",
             "Test::CPAN::Changes" : "0.19",
             "Test::CPAN::Meta" : "0",
-            "Test::Kwalitee" : "1.12",
+            "Test::EOL" : "0",
+            "Test::Kwalitee" : "1.21",
+            "Test::MinimumVersion" : "0",
+            "Test::More" : "0.96",
             "Test::Pod" : "1.41",
             "Test::Pod::Coverage" : "1.08"
          },
          "suggests" : {
-            "Dist::Zilla::App::Command::bakeini" : "0.001001",
-            "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.017002"
+            "Dist::Zilla::App::Command::bakeini" : "0.002006",
+            "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025021"
          }
       },
       "runtime" : {
@@ -93,22 +108,24 @@
       "test" : {
          "recommends" : {
             "CPAN::Meta" : "2.120900",
-            "ExtUtils::MakeMaker" : "6.98",
-            "Test::More" : "1.001003"
+            "ExtUtils::MakeMaker" : "7.00",
+            "Test::More" : "0.99"
          },
          "requires" : {
             "ExtUtils::MakeMaker" : "0",
             "File::Spec" : "0",
             "HTTP::Response" : "0",
             "HTTP::Tiny" : "0.022",
-            "Test::More" : "0.89"
+            "Test::More" : "0",
+            "lib" : "0",
+            "perl" : "5.006"
          }
       }
    },
    "provides" : {
       "HTTP::Tiny::Mech" : {
          "file" : "lib/HTTP/Tiny/Mech.pm",
-         "version" : "1.001001"
+         "version" : "1.001002"
       }
    },
    "release_status" : "stable",
@@ -123,103 +140,24 @@
          "web" : "https://github.com/kentnl/HTTP-Tiny-Mech"
       }
    },
-   "version" : "1.001001",
+   "version" : "1.001002",
    "x_BuiltWith" : {
-      "modules" : {
-         "CPAN::Meta" : "2.142060",
-         "Dist::Zilla::App::Command::bakeini" : "0.001001",
-         "Dist::Zilla::Plugin::Authority" : "1.006",
-         "Dist::Zilla::Plugin::AutoPrereqs" : "5.020",
-         "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.002",
-         "Dist::Zilla::Plugin::ConfirmRelease" : "5.020",
-         "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.103510",
-         "Dist::Zilla::Plugin::EOLTests" : "0.02",
-         "Dist::Zilla::Plugin::Git::Check" : "2.023",
-         "Dist::Zilla::Plugin::Git::Commit" : "2.023",
-         "Dist::Zilla::Plugin::Git::CommitBuild" : "2.023",
-         "Dist::Zilla::Plugin::Git::Contributors" : "0.006",
-         "Dist::Zilla::Plugin::Git::GatherDir" : "2.023",
-         "Dist::Zilla::Plugin::Git::NextRelease" : "0.002011",
-         "Dist::Zilla::Plugin::Git::Tag" : "2.023",
-         "Dist::Zilla::Plugin::GithubMeta" : "0.46",
-         "Dist::Zilla::Plugin::License" : "5.020",
-         "Dist::Zilla::Plugin::MakeMaker" : "5.020",
-         "Dist::Zilla::Plugin::Manifest" : "5.020",
-         "Dist::Zilla::Plugin::ManifestSkip" : "5.020",
-         "Dist::Zilla::Plugin::MetaConfig" : "5.020",
-         "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.001000",
-         "Dist::Zilla::Plugin::MetaJSON" : "5.020",
-         "Dist::Zilla::Plugin::MetaProvides::Package" : "2.000003",
-         "Dist::Zilla::Plugin::MetaTests" : "5.020",
-         "Dist::Zilla::Plugin::MetaYAML" : "5.020",
-         "Dist::Zilla::Plugin::MinimumPerl" : "1.003",
-         "Dist::Zilla::Plugin::PodCoverageTests" : "5.020",
-         "Dist::Zilla::Plugin::PodSyntaxTests" : "5.020",
-         "Dist::Zilla::Plugin::PodWeaver" : "4.005",
-         "Dist::Zilla::Plugin::Prereqs" : "5.020",
-         "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0.002000",
-         "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.142250",
-         "Dist::Zilla::Plugin::ReadmeFromPod" : "0.21",
-         "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0.001002",
-         "Dist::Zilla::Plugin::RunExtraTests" : "0.022",
-         "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.008",
-         "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.002001",
-         "Dist::Zilla::Plugin::Test::Kwalitee" : "2.07",
-         "Dist::Zilla::Plugin::Test::MinimumVersion" : "2.000005",
-         "Dist::Zilla::Plugin::Test::Perl::Critic" : "2.112410",
-         "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0.019",
-         "Dist::Zilla::Plugin::TestRelease" : "5.020",
-         "Dist::Zilla::Plugin::Twitter" : "0.025",
-         "Dist::Zilla::Plugin::UploadToCPAN" : "5.020",
-         "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.017002",
-         "ExtUtils::MakeMaker" : "6.98",
-         "File::Spec" : "3.48",
-         "HTTP::Request" : "6.00",
-         "HTTP::Response" : "6.04",
-         "HTTP::Tiny" : "0.047",
-         "Pod::Coverage::TrustPod" : "0.100003",
-         "Test::CPAN::Changes" : "0.30",
-         "Test::CPAN::Meta" : "0.23",
-         "Test::Kwalitee" : "1.19",
-         "Test::More" : "1.001003",
-         "Test::Pod" : "1.48",
-         "Test::Pod::Coverage" : "1.10",
-         "WWW::Mechanize" : "1.73",
-         "parent" : "0.228",
-         "strict" : "1.08",
-         "warnings" : "1.24"
-      },
-      "perl" : {
-         "original" : "v5.21.1",
-         "qv" : 1,
-         "version" : [
-            5,
-            21,
-            1
-         ]
-      },
-      "perl-config" : {
-         "gccversion" : "4.8.3",
-         "myarchname" : "x86_64-linux",
-         "osname" : "linux"
-      },
-      "platform" : "linux",
-      "uname" : "Linux 3.15.5-aufs x86_64 GenuineIntel GNU/Linux"
+      "external_file" : "misc/built_with.json"
    },
    "x_Dist_Zilla" : {
       "perl" : {
-         "version" : "5.021001"
+         "version" : "5.025010"
       },
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@Author::KENTNL/MetaConfig",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::GithubMeta",
             "name" : "@Author::KENTNL/GithubMeta",
-            "version" : "0.46"
+            "version" : "0.54"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaProvides::Package",
@@ -229,24 +167,32 @@
                      {
                         "class" : "Dist::Zilla::Plugin::FinderCode",
                         "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM",
-                        "version" : "5.020"
+                        "version" : "6.009"
                      }
-                  ]
+                  ],
+                  "include_underscores" : 0
                },
                "Dist::Zilla::Role::MetaProvider::Provider" : {
-                  "inherit_missing" : "1",
-                  "inherit_version" : "1",
-                  "meta_noindex" : "1"
+                  "$Dist::Zilla::Role::MetaProvider::Provider::VERSION" : "2.002004",
+                  "inherit_missing" : 1,
+                  "inherit_version" : 1,
+                  "meta_noindex" : 1
+               },
+               "Dist::Zilla::Role::ModuleMetadata" : {
+                  "Module::Metadata" : "1.000033",
+                  "version" : "0.004"
                }
             },
             "name" : "@Author::KENTNL/MetaProvides::Package",
-            "version" : "2.000003"
+            "version" : "2.004003"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaData::BuiltWith",
             "config" : {
                "Dist::Zilla::Plugin::MetaData::BuiltWith" : {
+                  "$Module::Metadata::VERSION" : "1.000033",
                   "_stash_key" : "x_BuiltWith",
+                  "external_file_name" : "misc/built_with.json",
                   "show_config" : "1",
                   "show_uname" : "1",
                   "uname" : {
@@ -258,101 +204,151 @@
                         "-i"
                      ],
                      "uname_call" : "uname"
-                  }
+                  },
+                  "use_external_file" : "only"
                }
             },
             "name" : "@Author::KENTNL/MetaData::BuiltWith",
-            "version" : "1.001000"
+            "version" : "1.004005"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Contributors",
             "config" : {
                "Dist::Zilla::Plugin::Git::Contributors" : {
-                  "include_authors" : "0",
-                  "include_releaser" : "0",
-                  "order_by" : "name"
+                  "git --version" : "2.11.1",
+                  "include_authors" : 0,
+                  "include_releaser" : 0,
+                  "order_by" : "name",
+                  "paths" : []
                }
             },
             "name" : "@Author::KENTNL/Git::Contributors",
-            "version" : "0.006"
+            "version" : "0.029"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::GatherDir",
             "config" : {
-               "Dist::Zilla::Plugin::Git::GatherDir" : {
-                  "include_untracked" : "0"
+               "Dist::Zilla::Plugin::GatherDir" : {
+                  "exclude_filename" : [
+                     "LICENSE",
+                     "README",
+                     "README.mkdn",
+                     "README.pod"
+                  ],
+                  "exclude_match" : [],
+                  "follow_symlinks" : 0,
+                  "include_dotfiles" : 1,
+                  "prefix" : "",
+                  "prune_directory" : [],
+                  "root" : "."
                },
-               "Dist::Zilla::Role::Git::Repo" : {
-                  "repo_root" : "."
+               "Dist::Zilla::Plugin::Git::GatherDir" : {
+                  "include_untracked" : 0
                }
             },
             "name" : "@Author::KENTNL/Git::GatherDir",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@Author::KENTNL/License",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@Author::KENTNL/MetaJSON",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
-            "class" : "Dist::Zilla::Plugin::MetaYAML",
-            "name" : "@Author::KENTNL/MetaYAML",
-            "version" : "5.020"
+            "class" : "Dist::Zilla::Plugin::MetaYAML::Minimal",
+            "config" : {
+               "Dist::Zilla::Plugin::MetaYAML::Minimal" : {
+                  "filename" : "META.yml",
+                  "version" : "1.4"
+               }
+            },
+            "name" : "@Author::KENTNL/MetaYAML::Minimal",
+            "version" : "0.001001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@Author::KENTNL/Manifest",
-            "version" : "5.020"
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Author::KENTNL::TravisCI",
+            "config" : {
+               "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : {
+                  "fail_perls" : [
+                     "5.8"
+                  ],
+                  "skip_perls" : []
+               }
+            },
+            "name" : "@Author::KENTNL/Author::KENTNL::TravisCI",
+            "version" : "0.001004"
          },
          {
             "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild",
             "name" : "@Author::KENTNL/CopyXBuild",
-            "version" : "0.103510"
+            "version" : "0.163040"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaTests",
             "name" : "@Author::KENTNL/MetaTests",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodCoverageTests",
             "name" : "@Author::KENTNL/PodCoverageTests",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@Author::KENTNL/PodSyntaxTests",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs",
             "name" : "@Author::KENTNL/Test::ReportPrereqs",
-            "version" : "0.019"
+            "version" : "0.025"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::Kwalitee",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::Kwalitee" : {
+                  "filename" : "xt/release/kwalitee.t",
+                  "skiptest" : []
+               }
+            },
             "name" : "@Author::KENTNL/Test::Kwalitee",
-            "version" : "2.07"
+            "version" : "2.12"
          },
          {
-            "class" : "Dist::Zilla::Plugin::EOLTests",
-            "name" : "@Author::KENTNL/EOLTests",
-            "version" : "0.02"
+            "class" : "Dist::Zilla::Plugin::Test::EOL",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::EOL" : {
+                  "filename" : "xt/author/eol.t",
+                  "finder" : [
+                     ":ExecFiles",
+                     ":InstallModules",
+                     ":TestFiles"
+                  ],
+                  "trailing_whitespace" : 1
+               }
+            },
+            "name" : "@Author::KENTNL/Test::EOL",
+            "version" : "0.19"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::MinimumVersion",
             "name" : "@Author::KENTNL/Test::MinimumVersion",
-            "version" : "2.000005"
+            "version" : "2.000007"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : "@Author::KENTNL/Test::Compile::PerFile/AUTOVIV/:InstallModulesPM",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::Compile::PerFile",
@@ -364,33 +360,43 @@
                   "path_translator" : "base64_filter",
                   "prefix" : "t/00-compile",
                   "skip" : [],
-                  "test_template" : "01-basic.t.tpl",
+                  "test_template" : "02-raw-require.t.tpl",
                   "xt_mode" : null
                }
             },
             "name" : "@Author::KENTNL/Test::Compile::PerFile",
-            "version" : "0.002001"
+            "version" : "0.004000"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::Perl::Critic",
             "name" : "@Author::KENTNL/Test::Perl::Critic",
-            "version" : "2.112410"
+            "version" : "3.000"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@Author::KENTNL/ManifestSkip",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::RewriteVersion::Sanitized",
             "config" : {
+               "Dist::Zilla::Plugin::RewriteVersion" : {
+                  "add_tarball_name" : 0,
+                  "finders" : [
+                     ":ExecFiles",
+                     ":InstallModules"
+                  ],
+                  "global" : 0,
+                  "skip_version_provider" : 0
+               },
                "Dist::Zilla::Role::Version::Sanitize" : {
+                  "$Dist::Zilla::Role::Version::Sanitize::VERSION" : "0.002003",
                   "mantissa" : "6",
                   "normal_form" : "numify"
                }
             },
             "name" : "@Author::KENTNL/RewriteVersion::Sanitized",
-            "version" : "0.001002"
+            "version" : "0.001006"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodWeaver",
@@ -404,98 +410,98 @@
                      {
                         "class" : "Pod::Weaver::Plugin::EnsurePod5",
                         "name" : "@CorePrep/EnsurePod5",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Plugin::H1Nester",
                         "name" : "@CorePrep/H1Nester",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Plugin::SingleEncoding",
                         "name" : "-SingleEncoding",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Name",
                         "name" : "Name",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Version",
                         "name" : "Version",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Region",
                         "name" : "prelude",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Generic",
                         "name" : "SYNOPSIS",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Generic",
                         "name" : "DESCRIPTION",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Generic",
                         "name" : "OVERVIEW",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "METHODS",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "ATTRIBUTES",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "PRIVATE_ATTRIBUTES",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "PRIVATE_METHODS",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Leftovers",
                         "name" : "Leftovers",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Region",
                         "name" : "postlude",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Authors",
                         "name" : "Authors",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Legal",
                         "name" : "Legal",
-                        "version" : "4.006"
+                        "version" : "4.015"
                      }
                   ]
                }
             },
             "name" : "@Author::KENTNL/PodWeaver",
-            "version" : "4.005"
+            "version" : "4.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoPrereqs",
             "name" : "@Author::KENTNL/AutoPrereqs",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -506,17 +512,22 @@
                }
             },
             "name" : "@Author::KENTNL/BundleDevelSuggests",
-            "version" : "5.020"
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs::AuthorDeps",
+            "name" : "@Author::KENTNL/Prereqs::AuthorDeps",
+            "version" : "0.006"
          },
          {
             "class" : "Dist::Zilla::Plugin::MinimumPerl",
             "name" : "@Author::KENTNL/MinimumPerl",
-            "version" : "1.003"
+            "version" : "1.006"
          },
          {
             "class" : "Dist::Zilla::Plugin::Authority",
             "name" : "@Author::KENTNL/Authority",
-            "version" : "1.006"
+            "version" : "1.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::MakeMaker",
@@ -526,22 +537,37 @@
                }
             },
             "name" : "@Author::KENTNL/MakeMaker",
-            "version" : "5.020"
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes",
+            "name" : "@Author::KENTNL/Author::KENTNL::RecommendFixes",
+            "version" : "0.005004"
          },
          {
-            "class" : "Dist::Zilla::Plugin::ReadmeFromPod",
-            "name" : "@Author::KENTNL/ReadmeFromPod",
-            "version" : "0.21"
+            "class" : "Dist::Zilla::Plugin::Readme::Brief",
+            "name" : "@Author::KENTNL/ShippedReadme",
+            "version" : "0.003001"
          },
          {
             "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+            "config" : {
+               "Dist::Zilla::Role::FileWatcher" : {
+                  "version" : "0.006"
+               }
+            },
             "name" : "@Author::KENTNL/ReadmeAnyFromPod",
-            "version" : "0.142250"
+            "version" : "0.163250"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::CPAN::Changes",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::CPAN::Changes" : {
+                  "changelog" : "Changes"
+               }
+            },
             "name" : "@Author::KENTNL/Test::CPAN::Changes",
-            "version" : "0.008"
+            "version" : "0.012"
          },
          {
             "class" : "Dist::Zilla::Plugin::RunExtraTests",
@@ -551,17 +577,17 @@
                }
             },
             "name" : "@Author::KENTNL/RunExtraTests",
-            "version" : "0.022"
+            "version" : "0.029"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@Author::KENTNL/TestRelease",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::ConfirmRelease",
             "name" : "@Author::KENTNL/ConfirmRelease",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Check",
@@ -571,82 +597,104 @@
                },
                "Dist::Zilla::Role::Git::DirtyFiles" : {
                   "allow_dirty" : [
-                     "dist.ini",
-                     "Changes"
+                     "Changes",
+                     "dist.ini"
                   ],
                   "allow_dirty_match" : [],
                   "changelog" : "Changes"
                },
                "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.1",
                   "repo_root" : "."
                }
             },
             "name" : "@Author::KENTNL/Git::Check",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Commit",
             "config" : {
                "Dist::Zilla::Plugin::Git::Commit" : {
                   "add_files_in" : [],
-                  "commit_msg" : "v%v%n%n%c",
-                  "time_zone" : "local"
+                  "commit_msg" : "v%v%n%n%c"
                },
                "Dist::Zilla::Role::Git::DirtyFiles" : {
                   "allow_dirty" : [
-                     "dist.ini",
-                     "Changes"
+                     "Changes",
+                     "dist.ini"
                   ],
                   "allow_dirty_match" : [],
                   "changelog" : "Changes"
                },
                "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.1",
                   "repo_root" : "."
+               },
+               "Dist::Zilla::Role::Git::StringFormatter" : {
+                  "time_zone" : "local"
                }
             },
             "name" : "@Author::KENTNL/commit_dirty_files",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "config" : {
                "Dist::Zilla::Plugin::Git::Tag" : {
                   "branch" : null,
+                  "changelog" : "Changes",
                   "signed" : 0,
-                  "tag" : "1.001001-source",
+                  "tag" : "1.001002-source",
                   "tag_format" : "%v-source",
-                  "tag_message" : "v%v",
-                  "time_zone" : "local"
+                  "tag_message" : "v%v"
                },
                "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.1",
                   "repo_root" : "."
+               },
+               "Dist::Zilla::Role::Git::StringFormatter" : {
+                  "time_zone" : "local"
                }
             },
             "name" : "@Author::KENTNL/tag_master",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::NextRelease",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::NextRelease" : {
+                  "default_branch" : "master"
+               }
+            },
             "name" : "@Author::KENTNL/Git::NextRelease",
-            "version" : "0.002011"
+            "version" : "0.004000"
          },
          {
             "class" : "Dist::Zilla::Plugin::BumpVersionAfterRelease",
+            "config" : {
+               "Dist::Zilla::Plugin::BumpVersionAfterRelease" : {
+                  "finders" : [
+                     ":ExecFiles",
+                     ":InstallModules"
+                  ],
+                  "global" : 0,
+                  "munge_makefile_pl" : 1
+               }
+            },
             "name" : "@Author::KENTNL/BumpVersionAfterRelease",
-            "version" : "0.002"
+            "version" : "0.015"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Commit",
             "config" : {
                "Dist::Zilla::Plugin::Git::Commit" : {
                   "add_files_in" : [],
-                  "commit_msg" : "v%v%n%n%c",
-                  "time_zone" : "local"
+                  "commit_msg" : "v%v%n%n%c"
                },
                "Dist::Zilla::Role::Git::DirtyFiles" : {
                   "allow_dirty" : [
-                     "dist.ini",
-                     "Changes"
+                     "Changes",
+                     "dist.ini"
                   ],
                   "allow_dirty_match" : [
                      "(?^u:^lib/)"
@@ -654,17 +702,21 @@
                   "changelog" : "Changes"
                },
                "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.1",
                   "repo_root" : "."
+               },
+               "Dist::Zilla::Role::Git::StringFormatter" : {
+                  "time_zone" : "local"
                }
             },
             "name" : "@Author::KENTNL/commit_release_changes",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::CommitBuild",
             "config" : {
                "Dist::Zilla::Plugin::Git::CommitBuild" : {
-                  "branch" : "build/%b",
+                  "branch" : "builds",
                   "build_root" : null,
                   "message" : "Build results of %h (on %b)",
                   "multiple_inheritance" : 0,
@@ -672,66 +724,64 @@
                   "release_message" : "Build results of %h (on %b)"
                },
                "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.1",
                   "repo_root" : "."
                }
             },
             "name" : "@Author::KENTNL/Git::CommitBuild",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "config" : {
                "Dist::Zilla::Plugin::Git::Tag" : {
                   "branch" : "releases",
+                  "changelog" : "Changes",
                   "signed" : 0,
-                  "tag" : "1.001001",
+                  "tag" : "1.001002",
                   "tag_format" : "%v",
-                  "tag_message" : "v%v",
-                  "time_zone" : "local"
+                  "tag_message" : "v%v"
                },
                "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.1",
                   "repo_root" : "."
+               },
+               "Dist::Zilla::Role::Git::StringFormatter" : {
+                  "time_zone" : "local"
                }
             },
             "name" : "@Author::KENTNL/tag_release",
-            "version" : "2.023"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@Author::KENTNL/UploadToCPAN",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Twitter",
             "name" : "@Author::KENTNL/Twitter",
-            "version" : "0.025"
+            "version" : "0.026"
          },
          {
-            "class" : "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled",
+            "class" : "Dist::Zilla::Plugin::Prereqs::Upgrade",
             "config" : {
-               "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : {
-                  "applyto_map" : [
-                     "build.requires = build.recommends",
-                     "test.requires = test.recommends",
-                     "runtime.requires = runtime.recommends",
-                     "configure.requires = configure.recommends",
-                     "develop.requires = develop.recommends"
-                  ],
-                  "applyto_phase" : [
-                     "build",
-                     "test",
-                     "runtime",
-                     "configure",
-                     "develop"
-                  ],
-                  "modules" : [
-                     "ExtUtils::MakeMaker",
-                     "Test::More"
-                  ]
+               "Dist::Zilla::Plugin::Prereqs::Upgrade" : {
+                  "modules" : {
+                     "Dist::Zila::Plugin::MetaProvides::Package" : "2.000000",
+                     "Dist::Zilla" : "5",
+                     "ExtUtils::MakeMaker" : "7.00",
+                     "File::ShareDir::Install" : "0.10",
+                     "Moo" : "1.000008",
+                     "Moose" : "2.000",
+                     "Path::Tiny" : "0.058",
+                     "Test::File::ShareDir" : "1.000000",
+                     "Test::More" : "0.99"
+                  }
                }
             },
-            "name" : "@Author::KENTNL/Prereqs::Recommend::MatchInstalled",
-            "version" : "0.002000"
+            "name" : "@Author::KENTNL/Prereqs::Upgrade",
+            "version" : "0.001001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled",
@@ -746,11 +796,18 @@
                   "modules" : [
                      "Dist::Zilla::PluginBundle::Author::KENTNL",
                      "Dist::Zilla::App::Command::bakeini"
-                  ]
+                  ],
+                  "source_relation" : "requires",
+                  "target_relation" : "recommends"
                }
             },
             "name" : "@Author::KENTNL/always_latest_develop_bundle",
-            "version" : "0.002000"
+            "version" : "0.003002"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::RemovePrereqs::Provided",
+            "name" : "@Author::KENTNL/RemovePrereqs::Provided",
+            "version" : "0.001001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -761,7 +818,7 @@
                }
             },
             "name" : "@Author::KENTNL/::Role::BundleDeps",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -772,64 +829,76 @@
                }
             },
             "name" : "Prereqs",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":IncModules",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "5.020"
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ExtraTestFiles",
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "5.020"
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":PerlExecFiles",
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":MainModule",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":AllFiles",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":NoFiles",
-            "version" : "5.020"
+            "version" : "6.009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM",
-            "version" : "5.020"
+            "version" : "6.009"
          }
       ],
       "zilla" : {
          "class" : "Dist::Zilla::Dist::Builder",
          "config" : {
-            "is_trial" : "0"
+            "is_trial" : 0
          },
-         "version" : "5.020"
+         "version" : "6.009"
       }
    },
    "x_authority" : "cpan:KENTNL",
    "x_contributors" : [
       "Pedro Melo <melo@simplicidade.org>"
-   ]
+   ],
+   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0227"
 }
+
diff --git a/META.yml b/META.yml
index ea9dd7a..8234d34 100644
--- a/META.yml
+++ b/META.yml
@@ -7,11 +7,14 @@ build_requires:
   File::Spec: '0'
   HTTP::Response: '0'
   HTTP::Tiny: '0.022'
-  Test::More: '0.89'
+  Test::More: '0'
+  lib: '0'
+  perl: '5.006'
 configure_requires:
   ExtUtils::MakeMaker: '0'
-dynamic_config: '0'
-generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060'
+  perl: '5.006'
+dynamic_config: 0
+generated_by: 'Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150010'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -20,7 +23,7 @@ name: HTTP-Tiny-Mech
 provides:
   HTTP::Tiny::Mech:
     file: lib/HTTP/Tiny/Mech.pm
-    version: '1.001001'
+    version: '1.001002'
 requires:
   HTTP::Request: '0'
   HTTP::Tiny: '0.022'
@@ -33,558 +36,4 @@ resources:
   bugtracker: https://github.com/kentnl/HTTP-Tiny-Mech/issues
   homepage: https://github.com/kentnl/HTTP-Tiny-Mech
   repository: https://github.com/kentnl/HTTP-Tiny-Mech.git
-version: '1.001001'
-x_BuiltWith:
-  modules:
-    CPAN::Meta: '2.142060'
-    Dist::Zilla::App::Command::bakeini: '0.001001'
-    Dist::Zilla::Plugin::Authority: '1.006'
-    Dist::Zilla::Plugin::AutoPrereqs: '5.020'
-    Dist::Zilla::Plugin::BumpVersionAfterRelease: '0.002'
-    Dist::Zilla::Plugin::ConfirmRelease: '5.020'
-    Dist::Zilla::Plugin::CopyFilesFromBuild: '0.103510'
-    Dist::Zilla::Plugin::EOLTests: '0.02'
-    Dist::Zilla::Plugin::Git::Check: '2.023'
-    Dist::Zilla::Plugin::Git::Commit: '2.023'
-    Dist::Zilla::Plugin::Git::CommitBuild: '2.023'
-    Dist::Zilla::Plugin::Git::Contributors: '0.006'
-    Dist::Zilla::Plugin::Git::GatherDir: '2.023'
-    Dist::Zilla::Plugin::Git::NextRelease: '0.002011'
-    Dist::Zilla::Plugin::Git::Tag: '2.023'
-    Dist::Zilla::Plugin::GithubMeta: '0.46'
-    Dist::Zilla::Plugin::License: '5.020'
-    Dist::Zilla::Plugin::MakeMaker: '5.020'
-    Dist::Zilla::Plugin::Manifest: '5.020'
-    Dist::Zilla::Plugin::ManifestSkip: '5.020'
-    Dist::Zilla::Plugin::MetaConfig: '5.020'
-    Dist::Zilla::Plugin::MetaData::BuiltWith: '1.001000'
-    Dist::Zilla::Plugin::MetaJSON: '5.020'
-    Dist::Zilla::Plugin::MetaProvides::Package: '2.000003'
-    Dist::Zilla::Plugin::MetaTests: '5.020'
-    Dist::Zilla::Plugin::MetaYAML: '5.020'
-    Dist::Zilla::Plugin::MinimumPerl: '1.003'
-    Dist::Zilla::Plugin::PodCoverageTests: '5.020'
-    Dist::Zilla::Plugin::PodSyntaxTests: '5.020'
-    Dist::Zilla::Plugin::PodWeaver: '4.005'
-    Dist::Zilla::Plugin::Prereqs: '5.020'
-    Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled: '0.002000'
-    Dist::Zilla::Plugin::ReadmeAnyFromPod: '0.142250'
-    Dist::Zilla::Plugin::ReadmeFromPod: '0.21'
-    Dist::Zilla::Plugin::RewriteVersion::Sanitized: '0.001002'
-    Dist::Zilla::Plugin::RunExtraTests: '0.022'
-    Dist::Zilla::Plugin::Test::CPAN::Changes: '0.008'
-    Dist::Zilla::Plugin::Test::Compile::PerFile: '0.002001'
-    Dist::Zilla::Plugin::Test::Kwalitee: '2.07'
-    Dist::Zilla::Plugin::Test::MinimumVersion: '2.000005'
-    Dist::Zilla::Plugin::Test::Perl::Critic: '2.112410'
-    Dist::Zilla::Plugin::Test::ReportPrereqs: '0.019'
-    Dist::Zilla::Plugin::TestRelease: '5.020'
-    Dist::Zilla::Plugin::Twitter: '0.025'
-    Dist::Zilla::Plugin::UploadToCPAN: '5.020'
-    Dist::Zilla::PluginBundle::Author::KENTNL: '2.017002'
-    ExtUtils::MakeMaker: '6.98'
-    File::Spec: '3.48'
-    HTTP::Request: '6.00'
-    HTTP::Response: '6.04'
-    HTTP::Tiny: '0.047'
-    Pod::Coverage::TrustPod: '0.100003'
-    Test::CPAN::Changes: '0.30'
-    Test::CPAN::Meta: '0.23'
-    Test::Kwalitee: '1.19'
-    Test::More: '1.001003'
-    Test::Pod: '1.48'
-    Test::Pod::Coverage: '1.10'
-    WWW::Mechanize: '1.73'
-    parent: '0.228'
-    strict: '1.08'
-    warnings: '1.24'
-  perl:
-    original: v5.21.1
-    qv: 1
-    version:
-      - 5
-      - 21
-      - 1
-  perl-config:
-    gccversion: 4.8.3
-    myarchname: x86_64-linux
-    osname: linux
-  platform: linux
-  uname: 'Linux 3.15.5-aufs x86_64 GenuineIntel GNU/Linux'
-x_Dist_Zilla:
-  perl:
-    version: '5.021001'
-  plugins:
-    -
-      class: Dist::Zilla::Plugin::MetaConfig
-      name: '@Author::KENTNL/MetaConfig'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::GithubMeta
-      name: '@Author::KENTNL/GithubMeta'
-      version: '0.46'
-    -
-      class: Dist::Zilla::Plugin::MetaProvides::Package
-      config:
-        Dist::Zilla::Plugin::MetaProvides::Package:
-          finder_objects:
-            -
-              class: Dist::Zilla::Plugin::FinderCode
-              name: '@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM'
-              version: '5.020'
-        Dist::Zilla::Role::MetaProvider::Provider:
-          inherit_missing: '1'
-          inherit_version: '1'
-          meta_noindex: '1'
-      name: '@Author::KENTNL/MetaProvides::Package'
-      version: '2.000003'
-    -
-      class: Dist::Zilla::Plugin::MetaData::BuiltWith
-      config:
-        Dist::Zilla::Plugin::MetaData::BuiltWith:
-          _stash_key: x_BuiltWith
-          show_config: '1'
-          show_uname: '1'
-          uname:
-            uname_args:
-              - -s
-              - -o
-              - -r
-              - -m
-              - -i
-            uname_call: uname
-      name: '@Author::KENTNL/MetaData::BuiltWith'
-      version: '1.001000'
-    -
-      class: Dist::Zilla::Plugin::Git::Contributors
-      config:
-        Dist::Zilla::Plugin::Git::Contributors:
-          include_authors: '0'
-          include_releaser: '0'
-          order_by: name
-      name: '@Author::KENTNL/Git::Contributors'
-      version: '0.006'
-    -
-      class: Dist::Zilla::Plugin::Git::GatherDir
-      config:
-        Dist::Zilla::Plugin::Git::GatherDir:
-          include_untracked: '0'
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/Git::GatherDir'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::License
-      name: '@Author::KENTNL/License'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::MetaJSON
-      name: '@Author::KENTNL/MetaJSON'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::MetaYAML
-      name: '@Author::KENTNL/MetaYAML'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Manifest
-      name: '@Author::KENTNL/Manifest'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::CopyFilesFromBuild
-      name: '@Author::KENTNL/CopyXBuild'
-      version: '0.103510'
-    -
-      class: Dist::Zilla::Plugin::MetaTests
-      name: '@Author::KENTNL/MetaTests'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::PodCoverageTests
-      name: '@Author::KENTNL/PodCoverageTests'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::PodSyntaxTests
-      name: '@Author::KENTNL/PodSyntaxTests'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Test::ReportPrereqs
-      name: '@Author::KENTNL/Test::ReportPrereqs'
-      version: '0.019'
-    -
-      class: Dist::Zilla::Plugin::Test::Kwalitee
-      name: '@Author::KENTNL/Test::Kwalitee'
-      version: '2.07'
-    -
-      class: Dist::Zilla::Plugin::EOLTests
-      name: '@Author::KENTNL/EOLTests'
-      version: '0.02'
-    -
-      class: Dist::Zilla::Plugin::Test::MinimumVersion
-      name: '@Author::KENTNL/Test::MinimumVersion'
-      version: '2.000005'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: '@Author::KENTNL/Test::Compile::PerFile/AUTOVIV/:InstallModulesPM'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Test::Compile::PerFile
-      config:
-        Dist::Zilla::Plugin::Test::Compile::PerFile:
-          file:
-            - lib/HTTP/Tiny/Mech.pm
-          path_translator: base64_filter
-          prefix: t/00-compile
-          skip: []
-          test_template: 01-basic.t.tpl
-          xt_mode: ~
-      name: '@Author::KENTNL/Test::Compile::PerFile'
-      version: '0.002001'
-    -
-      class: Dist::Zilla::Plugin::Test::Perl::Critic
-      name: '@Author::KENTNL/Test::Perl::Critic'
-      version: '2.112410'
-    -
-      class: Dist::Zilla::Plugin::ManifestSkip
-      name: '@Author::KENTNL/ManifestSkip'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::RewriteVersion::Sanitized
-      config:
-        Dist::Zilla::Role::Version::Sanitize:
-          mantissa: '6'
-          normal_form: numify
-      name: '@Author::KENTNL/RewriteVersion::Sanitized'
-      version: '0.001002'
-    -
-      class: Dist::Zilla::Plugin::PodWeaver
-      config:
-        Dist::Zilla::Plugin::PodWeaver:
-          finder:
-            - ':InstallModules'
-            - ':ExecFiles'
-          plugins:
-            -
-              class: Pod::Weaver::Plugin::EnsurePod5
-              name: '@CorePrep/EnsurePod5'
-              version: '4.006'
-            -
-              class: Pod::Weaver::Plugin::H1Nester
-              name: '@CorePrep/H1Nester'
-              version: '4.006'
-            -
-              class: Pod::Weaver::Plugin::SingleEncoding
-              name: -SingleEncoding
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Name
-              name: Name
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Version
-              name: Version
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Region
-              name: prelude
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Generic
-              name: SYNOPSIS
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Generic
-              name: DESCRIPTION
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Generic
-              name: OVERVIEW
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Collect
-              name: METHODS
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Collect
-              name: ATTRIBUTES
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Collect
-              name: PRIVATE_ATTRIBUTES
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Collect
-              name: PRIVATE_METHODS
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Leftovers
-              name: Leftovers
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Region
-              name: postlude
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Authors
-              name: Authors
-              version: '4.006'
-            -
-              class: Pod::Weaver::Section::Legal
-              name: Legal
-              version: '4.006'
-      name: '@Author::KENTNL/PodWeaver'
-      version: '4.005'
-    -
-      class: Dist::Zilla::Plugin::AutoPrereqs
-      name: '@Author::KENTNL/AutoPrereqs'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Prereqs
-      config:
-        Dist::Zilla::Plugin::Prereqs:
-          phase: develop
-          type: suggests
-      name: '@Author::KENTNL/BundleDevelSuggests'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::MinimumPerl
-      name: '@Author::KENTNL/MinimumPerl'
-      version: '1.003'
-    -
-      class: Dist::Zilla::Plugin::Authority
-      name: '@Author::KENTNL/Authority'
-      version: '1.006'
-    -
-      class: Dist::Zilla::Plugin::MakeMaker
-      config:
-        Dist::Zilla::Role::TestRunner:
-          default_jobs: '10'
-      name: '@Author::KENTNL/MakeMaker'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::ReadmeFromPod
-      name: '@Author::KENTNL/ReadmeFromPod'
-      version: '0.21'
-    -
-      class: Dist::Zilla::Plugin::ReadmeAnyFromPod
-      name: '@Author::KENTNL/ReadmeAnyFromPod'
-      version: '0.142250'
-    -
-      class: Dist::Zilla::Plugin::Test::CPAN::Changes
-      name: '@Author::KENTNL/Test::CPAN::Changes'
-      version: '0.008'
-    -
-      class: Dist::Zilla::Plugin::RunExtraTests
-      config:
-        Dist::Zilla::Role::TestRunner:
-          default_jobs: '10'
-      name: '@Author::KENTNL/RunExtraTests'
-      version: '0.022'
-    -
-      class: Dist::Zilla::Plugin::TestRelease
-      name: '@Author::KENTNL/TestRelease'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::ConfirmRelease
-      name: '@Author::KENTNL/ConfirmRelease'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Git::Check
-      config:
-        Dist::Zilla::Plugin::Git::Check:
-          untracked_files: die
-        Dist::Zilla::Role::Git::DirtyFiles:
-          allow_dirty:
-            - dist.ini
-            - Changes
-          allow_dirty_match: []
-          changelog: Changes
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/Git::Check'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::Git::Commit
-      config:
-        Dist::Zilla::Plugin::Git::Commit:
-          add_files_in: []
-          commit_msg: v%v%n%n%c
-          time_zone: local
-        Dist::Zilla::Role::Git::DirtyFiles:
-          allow_dirty:
-            - dist.ini
-            - Changes
-          allow_dirty_match: []
-          changelog: Changes
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/commit_dirty_files'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::Git::Tag
-      config:
-        Dist::Zilla::Plugin::Git::Tag:
-          branch: ~
-          signed: '0'
-          tag: 1.001001-source
-          tag_format: '%v-source'
-          tag_message: v%v
-          time_zone: local
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/tag_master'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::Git::NextRelease
-      name: '@Author::KENTNL/Git::NextRelease'
-      version: '0.002011'
-    -
-      class: Dist::Zilla::Plugin::BumpVersionAfterRelease
-      name: '@Author::KENTNL/BumpVersionAfterRelease'
-      version: '0.002'
-    -
-      class: Dist::Zilla::Plugin::Git::Commit
-      config:
-        Dist::Zilla::Plugin::Git::Commit:
-          add_files_in: []
-          commit_msg: v%v%n%n%c
-          time_zone: local
-        Dist::Zilla::Role::Git::DirtyFiles:
-          allow_dirty:
-            - dist.ini
-            - Changes
-          allow_dirty_match:
-            - (?^u:^lib/)
-          changelog: Changes
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/commit_release_changes'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::Git::CommitBuild
-      config:
-        Dist::Zilla::Plugin::Git::CommitBuild:
-          branch: build/%b
-          build_root: ~
-          message: 'Build results of %h (on %b)'
-          multiple_inheritance: '0'
-          release_branch: releases
-          release_message: 'Build results of %h (on %b)'
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/Git::CommitBuild'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::Git::Tag
-      config:
-        Dist::Zilla::Plugin::Git::Tag:
-          branch: releases
-          signed: '0'
-          tag: '1.001001'
-          tag_format: '%v'
-          tag_message: v%v
-          time_zone: local
-        Dist::Zilla::Role::Git::Repo:
-          repo_root: .
-      name: '@Author::KENTNL/tag_release'
-      version: '2.023'
-    -
-      class: Dist::Zilla::Plugin::UploadToCPAN
-      name: '@Author::KENTNL/UploadToCPAN'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Twitter
-      name: '@Author::KENTNL/Twitter'
-      version: '0.025'
-    -
-      class: Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled
-      config:
-        Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled:
-          applyto_map:
-            - 'build.requires = build.recommends'
-            - 'test.requires = test.recommends'
-            - 'runtime.requires = runtime.recommends'
-            - 'configure.requires = configure.recommends'
-            - 'develop.requires = develop.recommends'
-          applyto_phase:
-            - build
-            - test
-            - runtime
-            - configure
-            - develop
-          modules:
-            - ExtUtils::MakeMaker
-            - Test::More
-      name: '@Author::KENTNL/Prereqs::Recommend::MatchInstalled'
-      version: '0.002000'
-    -
-      class: Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled
-      config:
-        Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled:
-          applyto_map:
-            - 'develop.suggests = develop.suggests'
-          applyto_phase:
-            - develop
-          modules:
-            - Dist::Zilla::PluginBundle::Author::KENTNL
-            - Dist::Zilla::App::Command::bakeini
-      name: '@Author::KENTNL/always_latest_develop_bundle'
-      version: '0.002000'
-    -
-      class: Dist::Zilla::Plugin::Prereqs
-      config:
-        Dist::Zilla::Plugin::Prereqs:
-          phase: develop
-          type: requires
-      name: '@Author::KENTNL/::Role::BundleDeps'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::Prereqs
-      config:
-        Dist::Zilla::Plugin::Prereqs:
-          phase: runtime
-          type: requires
-      name: Prereqs
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':InstallModules'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':IncModules'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':TestFiles'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':ExecFiles'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':ShareFiles'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':MainModule'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':AllFiles'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: ':NoFiles'
-      version: '5.020'
-    -
-      class: Dist::Zilla::Plugin::FinderCode
-      name: '@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM'
-      version: '5.020'
-  zilla:
-    class: Dist::Zilla::Dist::Builder
-    config:
-      is_trial: '0'
-    version: '5.020'
-x_authority: cpan:KENTNL
-x_contributors:
-  - 'Pedro Melo <melo@simplicidade.org>'
+version: '1.001002'
diff --git a/Makefile.PL b/Makefile.PL
index 810c183..906feb0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,13 +1,10 @@
-
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.020.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.009.
 use strict;
 use warnings;
 
 use 5.006;
 
-use ExtUtils::MakeMaker ;
-
-
+use ExtUtils::MakeMaker;
 
 my %WriteMakefileArgs = (
   "ABSTRACT" => "Wrap a WWW::Mechanize instance in an HTTP::Tiny compatible interface.",
@@ -16,8 +13,8 @@ my %WriteMakefileArgs = (
     "ExtUtils::MakeMaker" => 0
   },
   "DISTNAME" => "HTTP-Tiny-Mech",
-  "EXE_FILES" => [],
   "LICENSE" => "perl",
+  "MIN_PERL_VERSION" => "5.006",
   "NAME" => "HTTP::Tiny::Mech",
   "PREREQ_PM" => {
     "HTTP::Request" => 0,
@@ -32,9 +29,10 @@ my %WriteMakefileArgs = (
     "File::Spec" => 0,
     "HTTP::Response" => 0,
     "HTTP::Tiny" => "0.022",
-    "Test::More" => "0.89"
+    "Test::More" => 0,
+    "lib" => 0
   },
-  "VERSION" => "1.001001",
+  "VERSION" => "1.001002",
   "test" => {
     "TESTS" => "t/*.t t/00-compile/*.t"
   }
@@ -47,8 +45,9 @@ my %FallbackPrereqs = (
   "HTTP::Request" => 0,
   "HTTP::Response" => 0,
   "HTTP::Tiny" => "0.022",
-  "Test::More" => "0.89",
+  "Test::More" => 0,
   "WWW::Mechanize" => 0,
+  "lib" => 0,
   "parent" => 0,
   "strict" => 0,
   "warnings" => 0
@@ -65,6 +64,3 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
 
 WriteMakefile(%WriteMakefileArgs);
-
-
-
diff --git a/README b/README
index 4e2e33a..0a34846 100644
--- a/README
+++ b/README
@@ -1,60 +1,45 @@
-NAME
-    HTTP::Tiny::Mech - Wrap a WWW::Mechanize instance in an HTTP::Tiny
-    compatible interface.
+HTTP::Tiny::Mech
 
-VERSION
-    version 1.001001
+This code is somewhat poorly documented, and highly experimental.
 
-SYNOPSIS
-      # Get something that expects an HTTP::Tiny instance
-      # to work with HTTP::Mechanize under the hood.
-      #
-      my $thing => ThingThatExpectsHTTPTiny->new(
-        ua => HTTP::Tiny::Mech->new()
-      );
+Its the result of a quick bit of hacking to get "MetaCPAN::API" working
+faster via the "WWW::Mechanize::Cached" module ( and gaining cache
+persistence via "CHI" )
 
-      # Get something that expects HTTP::Tiny
-      # to work via WWW::Mechanize::Cached
-      #
-      my $thing => ThingThatExpectsHTTPTiny->new(
-        ua => HTTP::Tiny::Mech->new(
-          mechua => WWW::Mechanize::Cached->new( )
-        );
-      );
+It works so far for this purpose.
 
-DESCRIPTION
-    This code is somewhat poorly documented, and highly experimental.
+At present, only "get" and "request" are implemented, and all other
+calls fall through to a native "HTTP::Tiny".
 
-    Its the result of a quick bit of hacking to get "MetaCPAN::API" working
-    faster via the "WWW::Mechanize::Cached" module ( and gaining cache
-    persistence via "CHI" )
+POD ERRORS
 
-    It works so far for this purpose.
+Hey! The above document had some coding errors, which are explained
+below:
 
-    At present, only "get" and "request" are implemented, and all other
-    calls fall through to a native "HTTP::Tiny".
+Around line 7:
+    Non-ASCII character seen before =encoding in '( and'. Assuming
+    CP1252
 
-ATTRIBUTES
-  "mechua"
-    This class provides one non-standard parameter not in HTTP::Tiny,
-    "mechua", which is normally an autovivified "WWW::Mechanize" instance.
+INSTALLATION
 
-    You may override this parameter if you want to provide a custom instance
-    of a "WWW::Mechanize" class.
+This is a Perl module distribution. It should be installed with whichever
+tool you use to manage your installation of Perl, e.g. any of
 
-WRAPPED METHODS
-  get
-    Interface should be the same as it is with "get" in HTTP::Tiny.
+  cpanm .
+  cpan  .
+  cpanp -i .
 
-  request
-    Interface should be the same as it is with "request" in HTTP::Tiny
+Consult http://www.cpan.org/modules/INSTALL.html for further instruction.
+Should you wish to install this module manually, the procedure is
 
-AUTHOR
-    Kent Fredric <kentnl@cpan.org>
+  perl Makefile.PL
+  make
+  make test
+  make install
 
 COPYRIGHT AND LICENSE
-    This software is copyright (c) 2014 by Kent Fredric <kentnl@cpan.org>.
 
-    This is free software; you can redistribute it and/or modify it under
-    the same terms as the Perl 5 programming language system itself.
+This software is copyright (c) 2017 by Kent Fredric <kentnl@cpan.org>.
 
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
diff --git a/dist.ini b/dist.ini
index 7d8b6d8..a2f65d4 100644
--- a/dist.ini
+++ b/dist.ini
@@ -1,5 +1,8 @@
 ; This file is generated from dist.ini.meta by dzil bakeini.
 ; Edit that file or the bundles contained within for long-term changes.
+; Generated by Dist::Zilla::Plugin::Author::KENTNL::DistINI version 1.0.22 at Mon Oct 17 16:27:42 2011
+; Uncomment this to bootstrap via self
+; [Bootstrap::lib]
 name = HTTP-Tiny-Mech
 author = Kent Fredric <kentnl@cpan.org>
 license = Perl_5
@@ -14,9 +17,11 @@ issues = 1
 :version = 1.14000001
 
 [MetaData::BuiltWith / @Author::KENTNL/MetaData::BuiltWith]
+:version = 1.004000
 show_config = 1
 show_uname = 1
 uname_args = -s -o -r -m -i
+use_external_file = only
 
 [Git::Contributors / @Author::KENTNL/Git::Contributors]
 :version = 0.006
@@ -35,10 +40,13 @@ include_dotfiles = 1
 
 [MetaJSON / @Author::KENTNL/MetaJSON]
 
-[MetaYAML / @Author::KENTNL/MetaYAML]
+[MetaYAML::Minimal / @Author::KENTNL/MetaYAML::Minimal]
 
 [Manifest / @Author::KENTNL/Manifest]
 
+[Author::KENTNL::TravisCI / @Author::KENTNL/Author::KENTNL::TravisCI]
+:version = 0.001002
+
 [CopyFilesFromBuild / @Author::KENTNL/CopyXBuild]
 copy = LICENSE
 
@@ -52,12 +60,14 @@ copy = LICENSE
 
 [Test::Kwalitee / @Author::KENTNL/Test::Kwalitee]
 
-[EOLTests / @Author::KENTNL/EOLTests]
+[Test::EOL / @Author::KENTNL/Test::EOL]
 trailing_whitespace = 1
 
 [Test::MinimumVersion / @Author::KENTNL/Test::MinimumVersion]
 
 [Test::Compile::PerFile / @Author::KENTNL/Test::Compile::PerFile]
+:version = 0.003902
+test_template = 02-raw-require.t.tpl
 
 [Test::Perl::Critic / @Author::KENTNL/Test::Perl::Critic]
 
@@ -76,7 +86,9 @@ replacer = replace_with_blank
 -phase = develop
 -type = suggests
 Dist::Zilla::App::Command::bakeini = 0.001000
-Dist::Zilla::PluginBundle::Author::KENTNL = 2.017001
+Dist::Zilla::PluginBundle::Author::KENTNL = 2.025021
+
+[Prereqs::AuthorDeps / @Author::KENTNL/Prereqs::AuthorDeps]
 
 [MinimumPerl / @Author::KENTNL/MinimumPerl]
 
@@ -89,7 +101,10 @@ locate_comment = 1
 [MakeMaker / @Author::KENTNL/MakeMaker]
 default_jobs = 10
 
-[ReadmeFromPod / @Author::KENTNL/ReadmeFromPod]
+[Author::KENTNL::RecommendFixes / @Author::KENTNL/Author::KENTNL::RecommendFixes]
+:version = 0.004002
+
+[Readme::Brief / @Author::KENTNL/ShippedReadme]
 
 [ReadmeAnyFromPod / @Author::KENTNL/ReadmeAnyFromPod]
 filename = README.mkdn
@@ -114,7 +129,9 @@ filename = Changes
 tag_format = %v-source
 
 [Git::NextRelease / @Author::KENTNL/Git::NextRelease]
-format = %v %{yyyy-MM-dd'T'HH:mm:ss}dZ
+:version = 0.004000
+default_branch = master
+format = %v %{yyyy-MM-dd'T'HH:mm:ss}dZ %h
 time_zone = UTC
 
 [BumpVersionAfterRelease / @Author::KENTNL/BumpVersionAfterRelease]
@@ -123,6 +140,7 @@ time_zone = UTC
 allow_dirty_match = ^lib/
 
 [Git::CommitBuild / @Author::KENTNL/Git::CommitBuild]
+branch = builds
 release_branch = releases
 
 [Git::Tag / @Author::KENTNL/tag_release]
@@ -136,9 +154,16 @@ hash_tags = #perl #cpan
 tweet_url = https://metacpan.org/release/{{$AUTHOR_UC}}/{{$DIST}}-{{$VERSION}}{{$TRIAL}}#whatsnew
 url_shortener = none
 
-[Prereqs::Recommend::MatchInstalled / @Author::KENTNL/Prereqs::Recommend::MatchInstalled]
-modules = ExtUtils::MakeMaker
-modules = Test::More
+[Prereqs::Upgrade / @Author::KENTNL/Prereqs::Upgrade]
+Dist::Zila::Plugin::MetaProvides::Package = 2.000000
+Dist::Zilla = 5
+ExtUtils::MakeMaker = 7.00
+File::ShareDir::Install = 0.10
+Moo = 1.000008
+Moose = 2.000
+Path::Tiny = 0.058
+Test::File::ShareDir = 1.000000
+Test::More = 0.99
 
 [Prereqs::Recommend::MatchInstalled / @Author::KENTNL/always_latest_develop_bundle]
 applyto_map = develop.suggests = develop.suggests
@@ -146,21 +171,33 @@ applyto_phase = develop
 modules = Dist::Zilla::PluginBundle::Author::KENTNL
 modules = Dist::Zilla::App::Command::bakeini
 
+[RemovePrereqs::Provided / @Author::KENTNL/RemovePrereqs::Provided]
+
 [Prereqs / @Author::KENTNL/::Role::BundleDeps]
+; version_major     = 0
+; version_minor     = 1
+; the following data denotes when this minor was minted
+; version_rel_year  = 2011
+; version_rel_month = 10
+; version_rel_day   = 17
+; version_rel_hour  = 16
+; version_rel_time_zone = Pacific/Auckland
+; auto_prereqs_skip = File::Find
 -phase = develop
 -relationship = requires
+Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes = 0.004002
+Dist::Zilla::Plugin::Author::KENTNL::TravisCI = 0.001002
 Dist::Zilla::Plugin::Authority = 1.006
 Dist::Zilla::Plugin::AutoPrereqs = 0
 Dist::Zilla::Plugin::BumpVersionAfterRelease = 0
 Dist::Zilla::Plugin::ConfirmRelease = 0
 Dist::Zilla::Plugin::CopyFilesFromBuild = 0
-Dist::Zilla::Plugin::EOLTests = 0
 Dist::Zilla::Plugin::Git::Check = 0
 Dist::Zilla::Plugin::Git::Commit = 0
 Dist::Zilla::Plugin::Git::CommitBuild = 0
 Dist::Zilla::Plugin::Git::Contributors = 0.006
 Dist::Zilla::Plugin::Git::GatherDir = 0
-Dist::Zilla::Plugin::Git::NextRelease = 0
+Dist::Zilla::Plugin::Git::NextRelease = 0.004000
 Dist::Zilla::Plugin::Git::Tag = 0
 Dist::Zilla::Plugin::GithubMeta = 0
 Dist::Zilla::Plugin::License = 0
@@ -168,23 +205,27 @@ Dist::Zilla::Plugin::MakeMaker = 0
 Dist::Zilla::Plugin::Manifest = 0
 Dist::Zilla::Plugin::ManifestSkip = 0
 Dist::Zilla::Plugin::MetaConfig = 0
-Dist::Zilla::Plugin::MetaData::BuiltWith = 0
+Dist::Zilla::Plugin::MetaData::BuiltWith = 1.004000
 Dist::Zilla::Plugin::MetaJSON = 0
 Dist::Zilla::Plugin::MetaProvides::Package = 1.14000001
 Dist::Zilla::Plugin::MetaTests = 0
-Dist::Zilla::Plugin::MetaYAML = 0
+Dist::Zilla::Plugin::MetaYAML::Minimal = 0
 Dist::Zilla::Plugin::MinimumPerl = 0
 Dist::Zilla::Plugin::PodCoverageTests = 0
 Dist::Zilla::Plugin::PodSyntaxTests = 0
 Dist::Zilla::Plugin::PodWeaver = 0
 Dist::Zilla::Plugin::Prereqs = 0
+Dist::Zilla::Plugin::Prereqs::AuthorDeps = 0
 Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled = 0
+Dist::Zilla::Plugin::Prereqs::Upgrade = 0
+Dist::Zilla::Plugin::Readme::Brief = 0
 Dist::Zilla::Plugin::ReadmeAnyFromPod = 0
-Dist::Zilla::Plugin::ReadmeFromPod = 0
+Dist::Zilla::Plugin::RemovePrereqs::Provided = 0
 Dist::Zilla::Plugin::RewriteVersion::Sanitized = 0
 Dist::Zilla::Plugin::RunExtraTests = 0
 Dist::Zilla::Plugin::Test::CPAN::Changes = 0
-Dist::Zilla::Plugin::Test::Compile::PerFile = 0
+Dist::Zilla::Plugin::Test::Compile::PerFile = 0.003902
+Dist::Zilla::Plugin::Test::EOL = 0
 Dist::Zilla::Plugin::Test::Kwalitee = 0
 Dist::Zilla::Plugin::Test::MinimumVersion = 0
 Dist::Zilla::Plugin::Test::Perl::Critic = 0
diff --git a/dist.ini.meta b/dist.ini.meta
index 98e578b..89507aa 100644
--- a/dist.ini.meta
+++ b/dist.ini.meta
@@ -1,4 +1,5 @@
 ; Generated by Dist::Zilla::Plugin::Author::KENTNL::DistINI version 1.0.22 at Mon Oct 17 16:27:42 2011
+; vim: syntax=dosini
 name             = HTTP-Tiny-Mech
 author           = Kent Fredric <kentnl@cpan.org>
 license          = Perl_5
@@ -9,12 +10,11 @@ copyright_holder = Kent Fredric <kentnl@cpan.org>
 
 [@Author::KENTNL]
 :version          = 2.013
-git_versions      = 1
 toolkit           = eumm
 toolkit_hardness  = soft
 normal_form       = numify
 mantissa          = 6
-twitter_hash_tags = #perl #cpan
+# twitter_extra_hash_tags =
 copyfiles         = LICENSE
 srcreadme         = mkdn
 bumpversions      = 1
diff --git a/lib/HTTP/Tiny/Mech.pm b/lib/HTTP/Tiny/Mech.pm
index c10dd11..36687af 100644
--- a/lib/HTTP/Tiny/Mech.pm
+++ b/lib/HTTP/Tiny/Mech.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package HTTP::Tiny::Mech;
 
-our $VERSION = '1.001001';
+our $VERSION = '1.001002';
 
 # ABSTRACT: Wrap a WWW::Mechanize instance in an HTTP::Tiny compatible interface.
 
@@ -142,7 +142,7 @@ HTTP::Tiny::Mech - Wrap a WWW::Mechanize instance in an HTTP::Tiny compatible in
 
 =head1 VERSION
 
-version 1.001001
+version 1.001002
 
 =head1 SYNOPSIS
 
@@ -200,7 +200,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2014 by Kent Fredric <kentnl@cpan.org>.
+This software is copyright (c) 2017 by Kent Fredric <kentnl@cpan.org>.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
diff --git a/misc/Changes.deps b/misc/Changes.deps
index 22157a9..8f3de04 100644
--- a/misc/Changes.deps
+++ b/misc/Changes.deps
@@ -1,6 +1,17 @@
 This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test)
 
-1.001001
+1.001002
+ [Added / configure requires]
+ - perl 5.006
+
+ [Added / test requires]
+ - lib
+ - perl 5.006
+
+ [Changed / test requires]
+ - Test::More 0.89 → 0
+
+1.001001 2014-08-15T06:11:34Z
  [Added / test requires]
  - File::Spec
 
@@ -84,4 +95,3 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (co
 0.1.2 2011-10-17T09:42:07Z
 
 0.1.1 2011-10-17T03:48:43Z
-
diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all
index 4bdcfff..14d8419 100644
--- a/misc/Changes.deps.all
+++ b/misc/Changes.deps.all
@@ -1,6 +1,58 @@
 This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop)
 
-1.001001
+1.001002
+ [Added / configure requires]
+ - perl 5.006
+
+ [Added / develop recommends]
+ - Test::More 0.99
+
+ [Added / develop requires]
+ - Dist::Zilla 5
+ - Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes 0.004002
+ - Dist::Zilla::Plugin::Author::KENTNL::TravisCI 0.001002
+ - Dist::Zilla::Plugin::MetaYAML::Minimal
+ - Dist::Zilla::Plugin::Prereqs::AuthorDeps
+ - Dist::Zilla::Plugin::Prereqs::Upgrade
+ - Dist::Zilla::Plugin::Readme::Brief
+ - Dist::Zilla::Plugin::RemovePrereqs::Provided
+ - Dist::Zilla::Plugin::Test::EOL
+ - English
+ - Software::License::Perl_5
+ - Test::EOL
+ - Test::MinimumVersion
+ - Test::More 0.96
+
+ [Added / test requires]
+ - lib
+ - perl 5.006
+
+ [Changed / configure recommends]
+ - ExtUtils::MakeMaker 6.98 → 7.00
+
+ [Changed / develop requires]
+ - Dist::Zilla::Plugin::Git::NextRelease 0 → 0.004000
+ - Dist::Zilla::Plugin::MetaData::BuiltWith 0 → 1.004000
+ - Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902
+ - Test::Kwalitee 1.12 → 1.21
+
+ [Changed / develop suggests]
+ - Dist::Zilla::App::Command::bakeini 0.001001 → 0.002006
+ - Dist::Zilla::PluginBundle::Author::KENTNL 2.017002 → 2.025021
+
+ [Changed / test recommends]
+ - ExtUtils::MakeMaker 6.98 → 7.00
+ - Test::More 1.001003 → 0.99
+
+ [Changed / test requires]
+ - Test::More 0.89 → 0
+
+ [Removed / develop requires]
+ - Dist::Zilla::Plugin::EOLTests
+ - Dist::Zilla::Plugin::MetaYAML
+ - Dist::Zilla::Plugin::ReadmeFromPod
+
+1.001001 2014-08-15T06:11:34Z
  [Added / develop requires]
  - Dist::Zilla::Plugin::Git::Contributors 0.006
 
@@ -11,7 +63,7 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen
  - ExtUtils::MakeMaker 6.30 → 0
 
  [Changed / develop suggests]
- - Dist::Zilla::PluginBundle::Author::KENTNL 2.016004 → 2.017001
+ - Dist::Zilla::PluginBundle::Author::KENTNL 2.016004 → 2.017002
 
  [Changed / test recommends]
  - CPAN::Meta 0 → 2.120900
@@ -220,4 +272,3 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen
 0.1.2 2011-10-17T09:42:07Z
 
 0.1.1 2011-10-17T03:48:43Z
-
diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev
index 9b3047b..053fa58 100644
--- a/misc/Changes.deps.dev
+++ b/misc/Changes.deps.dev
@@ -1,11 +1,46 @@
 This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL )
 
-1.001001
+1.001002
+ [Added / develop recommends]
+ - Test::More 0.99
+
+ [Added / develop requires]
+ - Dist::Zilla 5
+ - Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes 0.004002
+ - Dist::Zilla::Plugin::Author::KENTNL::TravisCI 0.001002
+ - Dist::Zilla::Plugin::MetaYAML::Minimal
+ - Dist::Zilla::Plugin::Prereqs::AuthorDeps
+ - Dist::Zilla::Plugin::Prereqs::Upgrade
+ - Dist::Zilla::Plugin::Readme::Brief
+ - Dist::Zilla::Plugin::RemovePrereqs::Provided
+ - Dist::Zilla::Plugin::Test::EOL
+ - English
+ - Software::License::Perl_5
+ - Test::EOL
+ - Test::MinimumVersion
+ - Test::More 0.96
+
+ [Changed / develop requires]
+ - Dist::Zilla::Plugin::Git::NextRelease 0 → 0.004000
+ - Dist::Zilla::Plugin::MetaData::BuiltWith 0 → 1.004000
+ - Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902
+ - Test::Kwalitee 1.12 → 1.21
+
+ [Changed / develop suggests]
+ - Dist::Zilla::App::Command::bakeini 0.001001 → 0.002006
+ - Dist::Zilla::PluginBundle::Author::KENTNL 2.017002 → 2.025021
+
+ [Removed / develop requires]
+ - Dist::Zilla::Plugin::EOLTests
+ - Dist::Zilla::Plugin::MetaYAML
+ - Dist::Zilla::Plugin::ReadmeFromPod
+
+1.001001 2014-08-15T06:11:34Z
  [Added / develop requires]
  - Dist::Zilla::Plugin::Git::Contributors 0.006
 
  [Changed / develop suggests]
- - Dist::Zilla::PluginBundle::Author::KENTNL 2.016004 → 2.017001
+ - Dist::Zilla::PluginBundle::Author::KENTNL 2.016004 → 2.017002
 
 1.001000 2014-07-17T15:22:19Z
  [Added / develop requires]
@@ -132,4 +167,3 @@ This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and
 0.1.2 2011-10-17T09:42:07Z
 
 0.1.1 2011-10-17T03:48:43Z
-
diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt
index db5ffe0..1a6f6f1 100644
--- a/misc/Changes.deps.opt
+++ b/misc/Changes.deps.opt
@@ -1,6 +1,14 @@
 This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test)
 
-1.001001
+1.001002
+ [Changed / configure recommends]
+ - ExtUtils::MakeMaker 6.98 → 7.00
+
+ [Changed / test recommends]
+ - ExtUtils::MakeMaker 6.98 → 7.00
+ - Test::More 1.001003 → 0.99
+
+1.001001 2014-08-15T06:11:34Z
  [Changed / test recommends]
  - CPAN::Meta 0 → 2.120900
 
@@ -30,4 +38,3 @@ This file contains changes in OPTIONAL dependencies for standard CPAN phases (co
 0.1.2 2011-10-17T09:42:07Z
 
 0.1.1 2011-10-17T03:48:43Z
-
diff --git a/misc/built_with.json b/misc/built_with.json
new file mode 100644
index 0000000..f09775f
--- /dev/null
+++ b/misc/built_with.json
@@ -0,0 +1,93 @@
+{
+   "modules" : {
+      "CPAN::Meta" : "2.150010",
+      "Dist::Zilla" : "6.009",
+      "Dist::Zilla::App::Command::bakeini" : "0.002006",
+      "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.005004",
+      "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001004",
+      "Dist::Zilla::Plugin::Authority" : "1.009",
+      "Dist::Zilla::Plugin::AutoPrereqs" : "6.009",
+      "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.015",
+      "Dist::Zilla::Plugin::ConfirmRelease" : "6.009",
+      "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.163040",
+      "Dist::Zilla::Plugin::Git::Check" : "2.041",
+      "Dist::Zilla::Plugin::Git::Commit" : "2.041",
+      "Dist::Zilla::Plugin::Git::CommitBuild" : "2.041",
+      "Dist::Zilla::Plugin::Git::Contributors" : "0.029",
+      "Dist::Zilla::Plugin::Git::GatherDir" : "2.041",
+      "Dist::Zilla::Plugin::Git::NextRelease" : "0.004000",
+      "Dist::Zilla::Plugin::Git::Tag" : "2.041",
+      "Dist::Zilla::Plugin::GithubMeta" : "0.54",
+      "Dist::Zilla::Plugin::License" : "6.009",
+      "Dist::Zilla::Plugin::MakeMaker" : "6.009",
+      "Dist::Zilla::Plugin::Manifest" : "6.009",
+      "Dist::Zilla::Plugin::ManifestSkip" : "6.009",
+      "Dist::Zilla::Plugin::MetaConfig" : "6.009",
+      "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004005",
+      "Dist::Zilla::Plugin::MetaJSON" : "6.009",
+      "Dist::Zilla::Plugin::MetaProvides::Package" : "2.004003",
+      "Dist::Zilla::Plugin::MetaTests" : "6.009",
+      "Dist::Zilla::Plugin::MetaYAML::Minimal" : "0.001001",
+      "Dist::Zilla::Plugin::MinimumPerl" : "1.006",
+      "Dist::Zilla::Plugin::PodCoverageTests" : "6.009",
+      "Dist::Zilla::Plugin::PodSyntaxTests" : "6.009",
+      "Dist::Zilla::Plugin::PodWeaver" : "4.008",
+      "Dist::Zilla::Plugin::Prereqs" : "6.009",
+      "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0.006",
+      "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0.003002",
+      "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0.001001",
+      "Dist::Zilla::Plugin::Readme::Brief" : "0.003001",
+      "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.163250",
+      "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0.001001",
+      "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0.001006",
+      "Dist::Zilla::Plugin::RunExtraTests" : "0.029",
+      "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.012",
+      "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.004000",
+      "Dist::Zilla::Plugin::Test::EOL" : "0.19",
+      "Dist::Zilla::Plugin::Test::Kwalitee" : "2.12",
+      "Dist::Zilla::Plugin::Test::MinimumVersion" : "2.000007",
+      "Dist::Zilla::Plugin::Test::Perl::Critic" : "3.000",
+      "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0.025",
+      "Dist::Zilla::Plugin::TestRelease" : "6.009",
+      "Dist::Zilla::Plugin::Twitter" : "0.026",
+      "Dist::Zilla::Plugin::UploadToCPAN" : "6.009",
+      "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025021",
+      "English" : "1.10",
+      "ExtUtils::MakeMaker" : "7.24",
+      "File::Spec" : "3.66",
+      "HTTP::Request" : "6.11",
+      "HTTP::Response" : "6.11",
+      "HTTP::Tiny" : "0.070",
+      "Pod::Coverage::TrustPod" : "0.100003",
+      "Software::License::Perl_5" : "0.103012",
+      "Test::CPAN::Changes" : "0.400002",
+      "Test::CPAN::Meta" : "0.25",
+      "Test::EOL" : "1.6",
+      "Test::Kwalitee" : "1.25",
+      "Test::MinimumVersion" : "0.101082",
+      "Test::More" : "1.302073",
+      "Test::Pod" : "1.51",
+      "Test::Pod::Coverage" : "1.10",
+      "WWW::Mechanize" : "1.83",
+      "lib" : "0.64",
+      "parent" : "0.236",
+      "strict" : "1.11",
+      "warnings" : "1.37"
+   },
+   "perl" : {
+      "original" : "v5.25.10",
+      "qv" : 1,
+      "version" : [
+         5,
+         25,
+         10
+      ]
+   },
+   "perl-config" : {
+      "gccversion" : "5.4.0",
+      "myarchname" : "x86_64-linux",
+      "osname" : "linux"
+   },
+   "platform" : "linux",
+   "uname" : "Linux 4.8.5-gentoo x86_64 GenuineIntel GNU/Linux"
+}
diff --git a/t/00-compile/lib_HTTP_Tiny_Mech_pm.t b/t/00-compile/lib_HTTP_Tiny_Mech_pm.t
index e8b9af2..a32e5f2 100644
--- a/t/00-compile/lib_HTTP_Tiny_Mech_pm.t
+++ b/t/00-compile/lib_HTTP_Tiny_Mech_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/HTTP/Tiny/Mech.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.002001
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/HTTP/Tiny/Mech.pm");
+# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.004000
+# with template 02-raw-require.t.tpl
+my $file = "HTTP/Tiny/Mech.pm";
+my $err;
+{
+  local $@;
+  eval { require $file; 1 } or $err = $@;
+};
 
+if( not defined $err ) {
+  print "1..1\nok 1 - require ${file}\n";
+  exit 0;
+}
+print "1..1\nnot ok 1 - require ${file}\n";
+print STDERR "# ${_}\n" for split /\n/, $err;
+exit 1;
diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd
index 5419793..40b7ee6 100644
--- a/t/00-report-prereqs.dd
+++ b/t/00-report-prereqs.dd
@@ -1,26 +1,32 @@
 do { my $x = {
        'configure' => {
                         'recommends' => {
-                                          'ExtUtils::MakeMaker' => '6.98'
+                                          'ExtUtils::MakeMaker' => '7.00'
                                         },
                         'requires' => {
-                                        'ExtUtils::MakeMaker' => '0'
+                                        'ExtUtils::MakeMaker' => '0',
+                                        'perl' => '5.006'
                                       }
                       },
        'develop' => {
+                      'recommends' => {
+                                        'Test::More' => '0.99'
+                                      },
                       'requires' => {
+                                      'Dist::Zilla' => '5',
+                                      'Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes' => '0.004002',
+                                      'Dist::Zilla::Plugin::Author::KENTNL::TravisCI' => '0.001002',
                                       'Dist::Zilla::Plugin::Authority' => '1.006',
                                       'Dist::Zilla::Plugin::AutoPrereqs' => '0',
                                       'Dist::Zilla::Plugin::BumpVersionAfterRelease' => '0',
                                       'Dist::Zilla::Plugin::ConfirmRelease' => '0',
                                       'Dist::Zilla::Plugin::CopyFilesFromBuild' => '0',
-                                      'Dist::Zilla::Plugin::EOLTests' => '0',
                                       'Dist::Zilla::Plugin::Git::Check' => '0',
                                       'Dist::Zilla::Plugin::Git::Commit' => '0',
                                       'Dist::Zilla::Plugin::Git::CommitBuild' => '0',
                                       'Dist::Zilla::Plugin::Git::Contributors' => '0.006',
                                       'Dist::Zilla::Plugin::Git::GatherDir' => '0',
-                                      'Dist::Zilla::Plugin::Git::NextRelease' => '0',
+                                      'Dist::Zilla::Plugin::Git::NextRelease' => '0.004000',
                                       'Dist::Zilla::Plugin::Git::Tag' => '0',
                                       'Dist::Zilla::Plugin::GithubMeta' => '0',
                                       'Dist::Zilla::Plugin::License' => '0',
@@ -28,23 +34,27 @@ do { my $x = {
                                       'Dist::Zilla::Plugin::Manifest' => '0',
                                       'Dist::Zilla::Plugin::ManifestSkip' => '0',
                                       'Dist::Zilla::Plugin::MetaConfig' => '0',
-                                      'Dist::Zilla::Plugin::MetaData::BuiltWith' => '0',
+                                      'Dist::Zilla::Plugin::MetaData::BuiltWith' => '1.004000',
                                       'Dist::Zilla::Plugin::MetaJSON' => '0',
                                       'Dist::Zilla::Plugin::MetaProvides::Package' => '1.14000001',
                                       'Dist::Zilla::Plugin::MetaTests' => '0',
-                                      'Dist::Zilla::Plugin::MetaYAML' => '0',
+                                      'Dist::Zilla::Plugin::MetaYAML::Minimal' => '0',
                                       'Dist::Zilla::Plugin::MinimumPerl' => '0',
                                       'Dist::Zilla::Plugin::PodCoverageTests' => '0',
                                       'Dist::Zilla::Plugin::PodSyntaxTests' => '0',
                                       'Dist::Zilla::Plugin::PodWeaver' => '0',
                                       'Dist::Zilla::Plugin::Prereqs' => '0',
+                                      'Dist::Zilla::Plugin::Prereqs::AuthorDeps' => '0',
                                       'Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled' => '0',
+                                      'Dist::Zilla::Plugin::Prereqs::Upgrade' => '0',
+                                      'Dist::Zilla::Plugin::Readme::Brief' => '0',
                                       'Dist::Zilla::Plugin::ReadmeAnyFromPod' => '0',
-                                      'Dist::Zilla::Plugin::ReadmeFromPod' => '0',
+                                      'Dist::Zilla::Plugin::RemovePrereqs::Provided' => '0',
                                       'Dist::Zilla::Plugin::RewriteVersion::Sanitized' => '0',
                                       'Dist::Zilla::Plugin::RunExtraTests' => '0',
                                       'Dist::Zilla::Plugin::Test::CPAN::Changes' => '0',
-                                      'Dist::Zilla::Plugin::Test::Compile::PerFile' => '0',
+                                      'Dist::Zilla::Plugin::Test::Compile::PerFile' => '0.003902',
+                                      'Dist::Zilla::Plugin::Test::EOL' => '0',
                                       'Dist::Zilla::Plugin::Test::Kwalitee' => '0',
                                       'Dist::Zilla::Plugin::Test::MinimumVersion' => '0',
                                       'Dist::Zilla::Plugin::Test::Perl::Critic' => '0',
@@ -52,16 +62,21 @@ do { my $x = {
                                       'Dist::Zilla::Plugin::TestRelease' => '0',
                                       'Dist::Zilla::Plugin::Twitter' => '0',
                                       'Dist::Zilla::Plugin::UploadToCPAN' => '0',
+                                      'English' => '0',
                                       'Pod::Coverage::TrustPod' => '0',
+                                      'Software::License::Perl_5' => '0',
                                       'Test::CPAN::Changes' => '0.19',
                                       'Test::CPAN::Meta' => '0',
-                                      'Test::Kwalitee' => '1.12',
+                                      'Test::EOL' => '0',
+                                      'Test::Kwalitee' => '1.21',
+                                      'Test::MinimumVersion' => '0',
+                                      'Test::More' => '0.96',
                                       'Test::Pod' => '1.41',
                                       'Test::Pod::Coverage' => '1.08'
                                     },
                       'suggests' => {
-                                      'Dist::Zilla::App::Command::bakeini' => '0.001001',
-                                      'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.017002'
+                                      'Dist::Zilla::App::Command::bakeini' => '0.002006',
+                                      'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.025021'
                                     }
                     },
        'runtime' => {
@@ -78,15 +93,17 @@ do { my $x = {
        'test' => {
                    'recommends' => {
                                      'CPAN::Meta' => '2.120900',
-                                     'ExtUtils::MakeMaker' => '6.98',
-                                     'Test::More' => '1.001003'
+                                     'ExtUtils::MakeMaker' => '7.00',
+                                     'Test::More' => '0.99'
                                    },
                    'requires' => {
                                    'ExtUtils::MakeMaker' => '0',
                                    'File::Spec' => '0',
                                    'HTTP::Response' => '0',
                                    'HTTP::Tiny' => '0.022',
-                                   'Test::More' => '0.89'
+                                   'Test::More' => '0',
+                                   'lib' => '0',
+                                   'perl' => '5.006'
                                  }
                  }
      };
diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t
index 402b3d9..e338372 100644
--- a/t/00-report-prereqs.t
+++ b/t/00-report-prereqs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.019
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.025
 
 use Test::More tests => 1;
 
@@ -78,10 +78,10 @@ my $full_prereqs = _merge_prereqs(
 
 # Add dynamic prereqs to the included modules list (if we can)
 my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
-if ( $source && $HAS_CPAN_META ) {
-    if ( my $meta = eval { CPAN::Meta->load_file($source) } ) {
-        $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
-    }
+if ( $source && $HAS_CPAN_META
+    && (my $meta = eval { CPAN::Meta->load_file($source) } )
+) {
+    $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
 }
 else {
     $source = 'static metadata';
@@ -150,9 +150,16 @@ for my $phase ( qw(configure build test runtime develop other) ) {
             my $ml = _max( map { length $_->[0] } @reports );
             my $wl = _max( map { length $_->[1] } @reports );
             my $hl = _max( map { length $_->[2] } @reports );
-            splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl];
 
-            push @full_reports, map { sprintf("    %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports;
+            if ($type eq 'modules') {
+                splice @reports, 1, 0, ["-" x $ml, "", "-" x $hl];
+                push @full_reports, map { sprintf("    %*s %*s\n", -$ml, $_->[0], $hl, $_->[2]) } @reports;
+            }
+            else {
+                splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl];
+                push @full_reports, map { sprintf("    %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports;
+            }
+
             push @full_reports, "\n";
         }
     }
diff --git a/t/basic.t b/t/basic.t
index 7123dd6..d413f5a 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -5,44 +5,7 @@ use Test::More tests => 3;
 use HTTP::Tiny::Mech;
 use HTTP::Tiny 0.022;
 
-subtest basic => sub {
-  my $instance = HTTP::Tiny::Mech->new();
-  isa_ok( $instance,         'HTTP::Tiny' );
-  isa_ok( $instance,         'HTTP::Tiny::Mech' );
-  isa_ok( $instance->mechua, 'WWW::Mechanize' );
-};
-
-subtest "Parameters for HTTP::Tiny::Mech" => sub {
-  {
-
-    package Foo;
-    @Foo::ISA = ('WWW::Mechanize');
-  }
-  {
-
-    package Bar;
-    @Bar::ISA = ('WWW::Mechanize');
-  }
-  my $instance = HTTP::Tiny::Mech->new( mechua => Foo->new(), );
-  isa_ok( $instance,         'HTTP::Tiny' );
-  isa_ok( $instance,         'HTTP::Tiny::Mech' );
-  isa_ok( $instance->mechua, 'WWW::Mechanize' );
-  isa_ok( $instance->mechua, 'Foo' );
-  subtest "Set mechua" => sub {
-    $instance->mechua( Bar->new() );
-    isa_ok( $instance->mechua, 'WWW::Mechanize' );
-    isa_ok( $instance->mechua, 'Bar' );
-  };
-
-};
-
-subtest "Parameters for HTTP::Tiny" => sub {
-  my %test_map = (
-    agent         => "Test::Version/1.0",
-    local_address => "123.4.5.6",
-  );
-  for my $key ( sort keys %test_map ) {
-    my $instance = HTTP::Tiny::Mech->new( $key => $test_map{$key} );
-    can_ok( $instance, $key ) and is( $instance->$key(), $test_map{$key}, "Value pass through" );
-  }
-};
+my $instance = HTTP::Tiny::Mech->new();
+isa_ok( $instance,         'HTTP::Tiny' );
+isa_ok( $instance,         'HTTP::Tiny::Mech' );
+isa_ok( $instance->mechua, 'WWW::Mechanize' );
diff --git a/t/get.t b/t/get.t
index 82ff379..3edcdd2 100644
--- a/t/get.t
+++ b/t/get.t
@@ -1,66 +1,42 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 7;
 
 # ABSTRACT: Test ->get with a dummy class
 
 use HTTP::Tiny::Mech;
 use HTTP::Tiny 0.022;
-
-{
-
-  package FakeUA;
-  our $AUTOLOAD;
-
-  sub AUTOLOAD {
-    my $program = $AUTOLOAD;
-    $program =~ s/.*:://;
-
-    my ( $self, @args ) = @_;
-    push @{ $self->{calls} }, [ $program, @args ];
-    require HTTP::Response;
-    return HTTP::Response->new();
-  }
-
-  sub new {
-    my ( $self, @args ) = @_;
-    bless { args => \@args, calls => [] }, $self;
-  }
-
-}
+use lib 't/get';
+use FakeUA;
 
 my $instance = HTTP::Tiny::Mech->new( mechua => FakeUA->new(), );
 isa_ok( $instance,         'HTTP::Tiny' );
 isa_ok( $instance,         'HTTP::Tiny::Mech' );
 isa_ok( $instance->mechua, 'FakeUA' );
 
-subtest "get url" => sub {
+{
   local $instance->mechua->{calls} = [];
   my $result = $instance->get('http://www.example.org:80/');
-  is( ref $result, 'HASH', "Got a hash back" );
+  is( ref $result, 'HASH', "get url: Got a hash back" );
   note explain $instance;
-};
+}
 
-subtest "get url + opts" => sub {
+{
   local $instance->mechua->{calls} = [];
   my $result = $instance->get( 'http://www.example.org:80/', { args => {} } );
-  is( ref $result, 'HASH', "Got a hash back" );
+  is( ref $result, 'HASH', "get url + opts: Got a hash back" );
   note explain $instance;
-};
-
-subtest "request url" => sub {
+}
+{
   local $instance->mechua->{calls} = [];
   my $result = $instance->request( 'HEAD', 'http://www.example.org:80/' );
-  is( ref $result, 'HASH', "Got a hash back" );
+  is( ref $result, 'HASH', "request url: Got a hash back" );
   note explain $instance;
-};
-subtest "request url + opts" => sub {
+}
+{
   local $instance->mechua->{calls} = [];
   my $result = $instance->request( 'POST', 'http://www.example.org:80/', { headers => {}, content => "CONTENT" } );
-  is( ref $result, 'HASH', "Got a hash back" );
+  is( ref $result, 'HASH', "request url + opts: Got a hash back" );
   note explain $instance;
-};
-
-done_testing;
-
+}
diff --git a/t/get/FakeUA.pm b/t/get/FakeUA.pm
new file mode 100644
index 0000000..083ff2e
--- /dev/null
+++ b/t/get/FakeUA.pm
@@ -0,0 +1,30 @@
+use 5.006;    # our
+use strict;
+use warnings;
+
+package FakeUA;
+
+our $VERSION = '0.001000';
+
+# ABSTRACT: A fake dummy UA for doing get requests on
+
+# AUTHORITY
+
+our $AUTOLOAD;
+
+sub AUTOLOAD {
+  my $program = $AUTOLOAD;
+  $program =~ s/.*:://;
+
+  my ( $self, @args ) = @_;
+  push @{ $self->{calls} }, [ $program, @args ];
+  require HTTP::Response;
+  return HTTP::Response->new();
+}
+
+sub new {
+  my ( $self, @args ) = @_;
+  bless { args => \@args, calls => [] }, $self;
+}
+
+1;
diff --git a/t/mech-params.t b/t/mech-params.t
new file mode 100644
index 0000000..835a06c
--- /dev/null
+++ b/t/mech-params.t
@@ -0,0 +1,28 @@
+
+use strict;
+use warnings;
+
+use Test::More tests => 6;
+use HTTP::Tiny::Mech;
+use HTTP::Tiny 0.022;
+use WWW::Mechanize;
+
+BEGIN {
+
+  package Foo;
+  @Foo::ISA = ('WWW::Mechanize');
+}
+
+BEGIN {
+
+  package Bar;
+  @Bar::ISA = ('WWW::Mechanize');
+}
+my $instance = HTTP::Tiny::Mech->new( mechua => Foo->new(), );
+isa_ok( $instance,         'HTTP::Tiny' );
+isa_ok( $instance,         'HTTP::Tiny::Mech' );
+isa_ok( $instance->mechua, 'WWW::Mechanize' );
+isa_ok( $instance->mechua, 'Foo' );
+$instance->mechua( Bar->new() );
+isa_ok( $instance->mechua, 'WWW::Mechanize' );
+isa_ok( $instance->mechua, 'Bar' );
diff --git a/t/tiny-params.t b/t/tiny-params.t
new file mode 100644
index 0000000..2b421ee
--- /dev/null
+++ b/t/tiny-params.t
@@ -0,0 +1,16 @@
+
+use strict;
+use warnings;
+
+use Test::More tests => 2 * 2;
+use HTTP::Tiny::Mech;
+use HTTP::Tiny 0.022;
+
+my %test_map = (
+  agent         => "Test::Version/1.0",
+  local_address => "123.4.5.6",
+);
+for my $key ( sort keys %test_map ) {
+  my $instance = HTTP::Tiny::Mech->new( $key => $test_map{$key} );
+  can_ok( $instance, $key ) and is( $instance->$key(), $test_map{$key}, "Value pass through" );
+}
diff --git a/xt/author/eol.t b/xt/author/eol.t
new file mode 100644
index 0000000..ad98462
--- /dev/null
+++ b/xt/author/eol.t
@@ -0,0 +1,22 @@
+use strict;
+use warnings;
+
+# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.19
+
+use Test::More 0.88;
+use Test::EOL;
+
+my @files = (
+    'lib/HTTP/Tiny/Mech.pm',
+    't/00-compile/lib_HTTP_Tiny_Mech_pm.t',
+    't/00-report-prereqs.dd',
+    't/00-report-prereqs.t',
+    't/basic.t',
+    't/get.t',
+    't/get/FakeUA.pm',
+    't/mech-params.t',
+    't/tiny-params.t'
+);
+
+eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files;
+done_testing;
diff --git a/xt/release/pod-coverage.t b/xt/author/pod-coverage.t
similarity index 100%
rename from xt/release/pod-coverage.t
rename to xt/author/pod-coverage.t
diff --git a/xt/release/pod-syntax.t b/xt/author/pod-syntax.t
similarity index 84%
rename from xt/release/pod-syntax.t
rename to xt/author/pod-syntax.t
index f0468f1..e563e5d 100644
--- a/xt/release/pod-syntax.t
+++ b/xt/author/pod-syntax.t
@@ -1,5 +1,6 @@
 #!perl
 # This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
+use strict; use warnings;
 use Test::More;
 use Test::Pod 1.41;
 
diff --git a/xt/release/cpan-changes.t b/xt/release/cpan-changes.t
index 8e6e413..286005a 100644
--- a/xt/release/cpan-changes.t
+++ b/xt/release/cpan-changes.t
@@ -1,11 +1,10 @@
-#!perl
-
 use strict;
 use warnings;
 
-use Test::More 0.96 tests => 2;
-use_ok('Test::CPAN::Changes');
+# this test was generated with Dist::Zilla::Plugin::Test::CPAN::Changes 0.012
+
+use Test::More 0.96 tests => 1;
+use Test::CPAN::Changes;
 subtest 'changes_ok' => sub {
     changes_file_ok('Changes');
 };
-done_testing();
diff --git a/xt/release/eol.t b/xt/release/eol.t
deleted file mode 100644
index d13c49d..0000000
--- a/xt/release/eol.t
+++ /dev/null
@@ -1,8 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-eval 'use Test::EOL';
-plan skip_all => 'Test::EOL required' if $@;
-
-all_perl_files_ok({ trailing_whitespace => 1 });
diff --git a/xt/release/kwalitee.t b/xt/release/kwalitee.t
index 13cecfa..c986546 100644
--- a/xt/release/kwalitee.t
+++ b/xt/release/kwalitee.t
@@ -1,4 +1,9 @@
-# this test was generated with Dist::Zilla::Plugin::Test::Kwalitee 2.07
+# this test was generated with Dist::Zilla::Plugin::Test::Kwalitee 2.12
 use strict;
 use warnings;
-use Test::Kwalitee;
+use Test::More 0.88;
+use Test::Kwalitee 1.21 'kwalitee_ok';
+
+kwalitee_ok();
+
+done_testing;