From cffaa428e7844158a8e6b242b54a559a97851c14 Mon Sep 17 00:00:00 2001
From: Kent Fredric <kentfredric@gmail.com>
Date: Sat, 4 Mar 2017 22:30:37 +1300
Subject: [PATCH] Build results of 6e05f9a (on master)

---
 .travis.yml                                   |   3 +-
 Changes                                       |  10 +
 LICENSE                                       |   6 +-
 MANIFEST                                      |   6 +-
 META.json                                     | 337 +++++++++++-------
 META.yml                                      |  20 +-
 Makefile.PL                                   |   9 +-
 README                                        |   2 +-
 dist.ini                                      |   6 +-
 lib/CPAN/Meta/Prereqs/Diff.pm                 |   6 +-
 lib/CPAN/Meta/Prereqs/Diff/Addition.pm        |   6 +-
 lib/CPAN/Meta/Prereqs/Diff/Change.pm          |   6 +-
 lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm       |   6 +-
 lib/CPAN/Meta/Prereqs/Diff/Removal.pm         |   6 +-
 lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm     |   6 +-
 lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm         |   6 +-
 misc/Changes.deps                             |   6 +-
 misc/Changes.deps.all                         |  19 +-
 misc/Changes.deps.dev                         |  16 +-
 misc/Changes.deps.opt                         |   4 +-
 misc/built_with.json                          | 139 ++++----
 .../lib_CPAN_Meta_Prereqs_Diff_Addition_pm.t  |  24 +-
 .../lib_CPAN_Meta_Prereqs_Diff_Change_pm.t    |  24 +-
 .../lib_CPAN_Meta_Prereqs_Diff_Downgrade_pm.t |  24 +-
 .../lib_CPAN_Meta_Prereqs_Diff_Removal_pm.t   |  24 +-
 ...ib_CPAN_Meta_Prereqs_Diff_Role_Change_pm.t |  24 +-
 .../lib_CPAN_Meta_Prereqs_Diff_Upgrade_pm.t   |  24 +-
 t/00-compile/lib_CPAN_Meta_Prereqs_Diff_pm.t  |  24 +-
 t/00-report-prereqs.dd                        |  13 +-
 t/00-report-prereqs.t                         |  10 +-
 t/basic.t                                     |  78 ++--
 t/constructors.t                              |  27 +-
 t/realworld.t                                 |  23 +-
 xt/author/eol.t                               |   2 +-
 xt/{release => author}/pod-coverage.t         |   0
 xt/{release => author}/pod-syntax.t           |   1 +
 xt/release/cpan-changes.t                     |   9 +-
 xt/release/kwalitee.t                         |   2 +-
 38 files changed, 577 insertions(+), 381 deletions(-)
 rename xt/{release => author}/pod-coverage.t (100%)
 rename xt/{release => author}/pod-syntax.t (84%)

diff --git a/.travis.yml b/.travis.yml
index 7c23036..af9ef6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,8 @@ branches:
     - releases
 install:
   - time perl ./maint-travis-ci/install_deps_early.pl
-  - time perl ./maint-travis-ci/install_deps.pl
+  - time perl ./maint-travis-ci/autoinstall_dzil.pl
+  - time perl ./maint-travis-ci/install_deps_2.pl
 language: perl
 matrix:
   allow_failures:
diff --git a/Changes b/Changes
index 9b7d0d2..f01a81c 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,15 @@
 Release history for CPAN-Meta-Prereqs-Diff
 
+0.001004 2017-03-04T09:14:59Z d028807
+ [Bugfix]
+ - Avoid test failures on 5.26 w/ -Ddefault_inc_excludes_dot
+ - Closes https://github.com/kentnl/CPAN-Meta-Prereqs-Diff/issues/1
+
+ [Dependencies::Stats]
+ - Dependencies changed since 0.001003, see misc/*.deps* for details
+ - develop: +3 ↑2 (suggests: ↑2)
+ - test: ↓1
+
 0.001003 2015-07-16T20:41:42Z 22579fa
  [Dependencies::Stats]
  - Dependencies changed since 0.001002, see misc/*.deps* for details
diff --git a/LICENSE b/LICENSE
index 8a16217..d0f6bfd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is Copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is Copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 This is free software, licensed under:
 
diff --git a/MANIFEST b/MANIFEST
index bb61b14..9e1b49d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.037.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.008.
 .gitignore
 .mailmap
 .perltidyrc
@@ -43,9 +43,9 @@ t/realworld.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/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 8cf3303..102c12f 100644
--- a/META.json
+++ b/META.json
@@ -4,13 +4,13 @@
       "Kent Fredric <kentnl@cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 5.037, CPAN::Meta::Converter version 2.150005",
+   "generated_by" : "Dist::Zilla version 6.008, 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" : "CPAN-Meta-Prereqs-Diff",
    "prereqs" : {
@@ -69,7 +69,7 @@
             "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",
@@ -78,18 +78,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::EOL" : "0",
             "Test::Kwalitee" : "1.21",
-            "Test::More" : "0.88",
+            "Test::MinimumVersion" : "0",
+            "Test::More" : "0.96",
             "Test::Pod" : "1.41",
             "Test::Pod::Coverage" : "1.08"
          },
          "suggests" : {
-            "Dist::Zilla::App::Command::bakeini" : "0.002005",
-            "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025001"
+            "Dist::Zilla::App::Command::bakeini" : "0.002006",
+            "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025021"
          }
       },
       "runtime" : {
@@ -116,7 +119,7 @@
             "CPAN::Meta" : "0",
             "ExtUtils::MakeMaker" : "0",
             "File::Spec" : "0",
-            "Test::More" : "0.89",
+            "Test::More" : "0",
             "perl" : "5.006"
          }
       }
@@ -124,31 +127,31 @@
    "provides" : {
       "CPAN::Meta::Prereqs::Diff" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       },
       "CPAN::Meta::Prereqs::Diff::Addition" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff/Addition.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       },
       "CPAN::Meta::Prereqs::Diff::Change" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff/Change.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       },
       "CPAN::Meta::Prereqs::Diff::Downgrade" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       },
       "CPAN::Meta::Prereqs::Diff::Removal" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff/Removal.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       },
       "CPAN::Meta::Prereqs::Diff::Role::Change" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       },
       "CPAN::Meta::Prereqs::Diff::Upgrade" : {
          "file" : "lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm",
-         "version" : "0.001003"
+         "version" : "0.001004"
       }
    },
    "release_status" : "stable",
@@ -163,24 +166,24 @@
          "web" : "https://github.com/kentnl/CPAN-Meta-Prereqs-Diff"
       }
    },
-   "version" : "0.001003",
+   "version" : "0.001004",
    "x_BuiltWith" : {
       "external_file" : "misc/built_with.json"
    },
    "x_Dist_Zilla" : {
       "perl" : {
-         "version" : "5.022000"
+         "version" : "5.025010"
       },
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@Author::KENTNL/MetaConfig",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::GithubMeta",
             "name" : "@Author::KENTNL/GithubMeta",
-            "version" : "0.52"
+            "version" : "0.54"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaProvides::Package",
@@ -190,23 +193,30 @@
                      {
                         "class" : "Dist::Zilla::Plugin::FinderCode",
                         "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM",
-                        "version" : "5.037"
+                        "version" : "6.008"
                      }
-                  ]
+                  ],
+                  "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.003001"
+            "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",
@@ -225,56 +235,57 @@
                }
             },
             "name" : "@Author::KENTNL/MetaData::BuiltWith",
-            "version" : "1.004002"
+            "version" : "1.004005"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Contributors",
             "config" : {
                "Dist::Zilla::Plugin::Git::Contributors" : {
-                  "include_authors" : "0",
-                  "include_releaser" : "0",
+                  "git --version" : "2.11.1",
+                  "include_authors" : 0,
+                  "include_releaser" : 0,
                   "order_by" : "name",
                   "paths" : []
                }
             },
             "name" : "@Author::KENTNL/Git::Contributors",
-            "version" : "0.011"
+            "version" : "0.029"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::GatherDir",
             "config" : {
                "Dist::Zilla::Plugin::GatherDir" : {
                   "exclude_filename" : [
-                     "README",
-                     "README.mkdn",
-                     "README.pod",
                      "CONTRIBUTING.pod",
                      "LICENSE",
-                     "Makefile.PL"
+                     "Makefile.PL",
+                     "README",
+                     "README.mkdn",
+                     "README.pod"
                   ],
                   "exclude_match" : [],
-                  "follow_symlinks" : "0",
-                  "include_dotfiles" : "1",
+                  "follow_symlinks" : 0,
+                  "include_dotfiles" : 1,
                   "prefix" : "",
                   "prune_directory" : [],
                   "root" : "."
                },
                "Dist::Zilla::Plugin::Git::GatherDir" : {
-                  "include_untracked" : "0"
+                  "include_untracked" : 0
                }
             },
             "name" : "@Author::KENTNL/Git::GatherDir",
-            "version" : "2.035"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@Author::KENTNL/License",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@Author::KENTNL/MetaJSON",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML::Minimal",
@@ -285,17 +296,25 @@
                }
             },
             "name" : "@Author::KENTNL/MetaYAML::Minimal",
-            "version" : "0.001000"
+            "version" : "0.001001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@Author::KENTNL/Manifest",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "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.001002"
+            "version" : "0.001004"
          },
          {
             "class" : "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING",
@@ -303,42 +322,48 @@
                "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : {
                   "document_version" : "0.1"
                },
-               "Dist::Zilla::Plugin::GenerateFile::ShareDir" : {
+               "Dist::Zilla::Plugin::GenerateFile::FromShareDir" : {
                   "destination_filename" : "CONTRIBUTING.pod",
                   "dist" : "Dist-Zilla-Plugin-Author-KENTNL-CONTRIBUTING",
                   "encoding" : "UTF-8",
                   "location" : "root",
                   "phase" : "build",
-                  "source_filename" : "contributing-0.1.pod"
+                  "source_filename" : "contributing-0.1.pod",
+                  "version" : "0.013"
+               },
+               "Dist::Zilla::Role::RepoFileInjector" : {
+                  "allow_overwrite" : 1,
+                  "repo_root" : ".",
+                  "version" : "0.007"
                }
             },
             "name" : "@Author::KENTNL/Author::KENTNL::CONTRIBUTING",
-            "version" : "0.001004"
+            "version" : "0.001005"
          },
          {
             "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild",
             "name" : "@Author::KENTNL/CopyXBuild",
-            "version" : "0.151680"
+            "version" : "0.163040"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaTests",
             "name" : "@Author::KENTNL/MetaTests",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodCoverageTests",
             "name" : "@Author::KENTNL/PodCoverageTests",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@Author::KENTNL/PodSyntaxTests",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs",
             "name" : "@Author::KENTNL/Test::ReportPrereqs",
-            "version" : "0.021"
+            "version" : "0.025"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::Kwalitee",
@@ -349,7 +374,7 @@
                }
             },
             "name" : "@Author::KENTNL/Test::Kwalitee",
-            "version" : "2.11"
+            "version" : "2.12"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::EOL",
@@ -357,25 +382,25 @@
                "Dist::Zilla::Plugin::Test::EOL" : {
                   "filename" : "xt/author/eol.t",
                   "finder" : [
-                     ":InstallModules",
                      ":ExecFiles",
+                     ":InstallModules",
                      ":TestFiles"
                   ],
-                  "trailing_whitespace" : "1"
+                  "trailing_whitespace" : 1
                }
             },
             "name" : "@Author::KENTNL/Test::EOL",
-            "version" : "0.18"
+            "version" : "0.19"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::MinimumVersion",
             "name" : "@Author::KENTNL/Test::MinimumVersion",
-            "version" : "2.000006"
+            "version" : "2.000007"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : "@Author::KENTNL/Test::Compile::PerFile/AUTOVIV/:InstallModulesPM",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::Compile::PerFile",
@@ -393,12 +418,12 @@
                   "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.003000"
+            "version" : "0.004000"
          },
          {
             "class" : "Dist::Zilla::Plugin::Test::Perl::Critic",
@@ -408,18 +433,28 @@
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@Author::KENTNL/ManifestSkip",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "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.001005"
+            "version" : "0.001006"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodWeaver",
@@ -433,103 +468,103 @@
                      {
                         "class" : "Pod::Weaver::Plugin::EnsurePod5",
                         "name" : "@CorePrep/EnsurePod5",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Plugin::H1Nester",
                         "name" : "@CorePrep/H1Nester",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Plugin::SingleEncoding",
                         "name" : "-SingleEncoding",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Name",
                         "name" : "Name",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Version",
                         "name" : "Version",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Region",
                         "name" : "prelude",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Generic",
                         "name" : "SYNOPSIS",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Generic",
                         "name" : "DESCRIPTION",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Generic",
                         "name" : "OVERVIEW",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "METHODS",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "ATTRIBUTES",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "REQUIRES",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "PRIVATE_ATTRIBUTES",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Collect",
                         "name" : "PRIVATE_METHODS",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Leftovers",
                         "name" : "Leftovers",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Region",
                         "name" : "postlude",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Authors",
                         "name" : "Authors",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      },
                      {
                         "class" : "Pod::Weaver::Section::Legal",
                         "name" : "Legal",
-                        "version" : "4.012"
+                        "version" : "4.015"
                      }
                   ]
                }
             },
             "name" : "@Author::KENTNL/PodWeaver",
-            "version" : "4.006"
+            "version" : "4.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoPrereqs",
             "name" : "@Author::KENTNL/AutoPrereqs",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -540,12 +575,12 @@
                }
             },
             "name" : "@Author::KENTNL/BundleDevelSuggests",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs::AuthorDeps",
             "name" : "@Author::KENTNL/Prereqs::AuthorDeps",
-            "version" : "0.004"
+            "version" : "0.006"
          },
          {
             "class" : "Dist::Zilla::Plugin::MinimumPerl",
@@ -565,17 +600,17 @@
                }
             },
             "name" : "@Author::KENTNL/MakeMaker",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes",
             "name" : "@Author::KENTNL/Author::KENTNL::RecommendFixes",
-            "version" : "0.005001"
+            "version" : "0.005003"
          },
          {
             "class" : "Dist::Zilla::Plugin::Readme::Brief",
             "name" : "@Author::KENTNL/ShippedReadme",
-            "version" : "0.002005"
+            "version" : "0.003001"
          },
          {
             "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
@@ -585,12 +620,17 @@
                }
             },
             "name" : "@Author::KENTNL/ReadmeAnyFromPod",
-            "version" : "0.150250"
+            "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.009"
+            "version" : "0.012"
          },
          {
             "class" : "Dist::Zilla::Plugin::RunExtraTests",
@@ -600,17 +640,17 @@
                }
             },
             "name" : "@Author::KENTNL/RunExtraTests",
-            "version" : "0.027"
+            "version" : "0.029"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@Author::KENTNL/TestRelease",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::ConfirmRelease",
             "name" : "@Author::KENTNL/ConfirmRelease",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Check",
@@ -620,59 +660,67 @@
                },
                "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.035"
+            "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.035"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "config" : {
                "Dist::Zilla::Plugin::Git::Tag" : {
                   "branch" : null,
+                  "changelog" : "Changes",
                   "signed" : 0,
-                  "tag" : "0.001003-source",
+                  "tag" : "0.001004-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.035"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::NextRelease",
@@ -686,21 +734,30 @@
          },
          {
             "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.009"
+            "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/)"
@@ -708,11 +765,15 @@
                   "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.035"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::CommitBuild",
@@ -726,34 +787,39 @@
                   "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.035"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "config" : {
                "Dist::Zilla::Plugin::Git::Tag" : {
                   "branch" : "releases",
+                  "changelog" : "Changes",
                   "signed" : 0,
-                  "tag" : "0.001003",
+                  "tag" : "0.001004",
                   "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.035"
+            "version" : "2.041"
          },
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@Author::KENTNL/UploadToCPAN",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Twitter",
@@ -778,7 +844,7 @@
                }
             },
             "name" : "@Author::KENTNL/Prereqs::Upgrade",
-            "version" : "0.001000"
+            "version" : "0.001001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled",
@@ -799,12 +865,12 @@
                }
             },
             "name" : "@Author::KENTNL/always_latest_develop_bundle",
-            "version" : "0.003001"
+            "version" : "0.003002"
          },
          {
             "class" : "Dist::Zilla::Plugin::RemovePrereqs::Provided",
             "name" : "@Author::KENTNL/RemovePrereqs::Provided",
-            "version" : "0.001000"
+            "version" : "0.001001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -815,7 +881,7 @@
                }
             },
             "name" : "@Author::KENTNL/::Role::BundleDeps",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -826,62 +892,73 @@
                }
             },
             "name" : "Prereqs",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":IncModules",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "5.037"
+            "version" : "6.008"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ExtraTestFiles",
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "5.037"
+            "version" : "6.008"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":PerlExecFiles",
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":MainModule",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":AllFiles",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":NoFiles",
-            "version" : "5.037"
+            "version" : "6.008"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM",
-            "version" : "5.037"
+            "version" : "6.008"
          }
       ],
       "zilla" : {
          "class" : "Dist::Zilla::Dist::Builder",
          "config" : {
-            "is_trial" : "0"
+            "is_trial" : 0
          },
-         "version" : "5.037"
+         "version" : "6.008"
       }
    },
-   "x_authority" : "cpan:KENTNL"
+   "x_authority" : "cpan:KENTNL",
+   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0227"
 }
 
diff --git a/META.yml b/META.yml
index 5997a82..cd9a56c 100644
--- a/META.yml
+++ b/META.yml
@@ -6,13 +6,13 @@ build_requires:
   CPAN::Meta: '0'
   ExtUtils::MakeMaker: '0'
   File::Spec: '0'
-  Test::More: '0.89'
+  Test::More: '0'
   perl: '5.006'
 configure_requires:
   ExtUtils::MakeMaker: '0'
   perl: '5.006'
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 5.037, CPAN::Meta::Converter version 2.150005'
+generated_by: 'Dist::Zilla version 6.008, CPAN::Meta::Converter version 2.150010'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -21,25 +21,25 @@ name: CPAN-Meta-Prereqs-Diff
 provides:
   CPAN::Meta::Prereqs::Diff:
     file: lib/CPAN/Meta/Prereqs/Diff.pm
-    version: '0.001003'
+    version: '0.001004'
   CPAN::Meta::Prereqs::Diff::Addition:
     file: lib/CPAN/Meta/Prereqs/Diff/Addition.pm
-    version: '0.001003'
+    version: '0.001004'
   CPAN::Meta::Prereqs::Diff::Change:
     file: lib/CPAN/Meta/Prereqs/Diff/Change.pm
-    version: '0.001003'
+    version: '0.001004'
   CPAN::Meta::Prereqs::Diff::Downgrade:
     file: lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm
-    version: '0.001003'
+    version: '0.001004'
   CPAN::Meta::Prereqs::Diff::Removal:
     file: lib/CPAN/Meta/Prereqs/Diff/Removal.pm
-    version: '0.001003'
+    version: '0.001004'
   CPAN::Meta::Prereqs::Diff::Role::Change:
     file: lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm
-    version: '0.001003'
+    version: '0.001004'
   CPAN::Meta::Prereqs::Diff::Upgrade:
     file: lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm
-    version: '0.001003'
+    version: '0.001004'
 requires:
   CPAN::Meta::Prereqs: '2.120620'
   CPAN::Meta::Requirements: '2.120620'
@@ -55,4 +55,4 @@ resources:
   bugtracker: https://github.com/kentnl/CPAN-Meta-Prereqs-Diff/issues
   homepage: https://github.com/kentnl/CPAN-Meta-Prereqs-Diff
   repository: https://github.com/kentnl/CPAN-Meta-Prereqs-Diff.git
-version: '0.001003'
+version: '0.001004'
diff --git a/Makefile.PL b/Makefile.PL
index e7cea16..97fa36f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.037.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.008.
 use strict;
 use warnings;
 
@@ -13,7 +13,6 @@ my %WriteMakefileArgs = (
     "ExtUtils::MakeMaker" => 0
   },
   "DISTNAME" => "CPAN-Meta-Prereqs-Diff",
-  "EXE_FILES" => [],
   "LICENSE" => "perl",
   "MIN_PERL_VERSION" => "5.006",
   "NAME" => "CPAN::Meta::Prereqs::Diff",
@@ -32,9 +31,9 @@ my %WriteMakefileArgs = (
     "CPAN::Meta" => 0,
     "ExtUtils::MakeMaker" => 0,
     "File::Spec" => 0,
-    "Test::More" => "0.89"
+    "Test::More" => 0
   },
-  "VERSION" => "0.001003",
+  "VERSION" => "0.001004",
   "test" => {
     "TESTS" => "t/*.t t/00-compile/*.t"
   }
@@ -51,7 +50,7 @@ my %FallbackPrereqs = (
   "Moo" => "1.000008",
   "Moo::Role" => 0,
   "Scalar::Util" => 0,
-  "Test::More" => "0.89",
+  "Test::More" => 0,
   "strict" => 0,
   "version" => 0,
   "warnings" => 0
diff --git a/README b/README
index ed0c4e1..77d303f 100644
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ Should you wish to install this module manually, the procedure is
 
 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric
+This software is copyright (c) 2017 by Kent Fredric
 <kentfredric@gmail.com>.
 
 This is free software; you can redistribute it and/or modify it under
diff --git a/dist.ini b/dist.ini
index ff31c61..df88088 100644
--- a/dist.ini
+++ b/dist.ini
@@ -76,6 +76,8 @@ 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]
 
@@ -94,7 +96,7 @@ replacer = replace_with_blank
 -phase = develop
 -type = suggests
 Dist::Zilla::App::Command::bakeini = 0.001000
-Dist::Zilla::PluginBundle::Author::KENTNL = 2.025001
+Dist::Zilla::PluginBundle::Author::KENTNL = 2.025021
 
 [Prereqs::AuthorDeps / @Author::KENTNL/Prereqs::AuthorDeps]
 
@@ -226,7 +228,7 @@ 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
diff --git a/lib/CPAN/Meta/Prereqs/Diff.pm b/lib/CPAN/Meta/Prereqs/Diff.pm
index e24fda6..7d33b1c 100644
--- a/lib/CPAN/Meta/Prereqs/Diff.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: Compare dependencies between releases using CPAN::Meta.
 
@@ -233,7 +233,7 @@ CPAN::Meta::Prereqs::Diff - Compare dependencies between releases using CPAN::Me
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 SYNOPSIS
 
@@ -353,7 +353,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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/lib/CPAN/Meta/Prereqs/Diff/Addition.pm b/lib/CPAN/Meta/Prereqs/Diff/Addition.pm
index d8d4c1b..5e5f1c7 100644
--- a/lib/CPAN/Meta/Prereqs/Diff/Addition.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff/Addition.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff::Addition;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: A new dependency
 
@@ -63,7 +63,7 @@ CPAN::Meta::Prereqs::Diff::Addition - A new dependency
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 METHODS
 
@@ -91,7 +91,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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/lib/CPAN/Meta/Prereqs/Diff/Change.pm b/lib/CPAN/Meta/Prereqs/Diff/Change.pm
index edac827..44df427 100644
--- a/lib/CPAN/Meta/Prereqs/Diff/Change.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff/Change.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff::Change;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: A dependency which changes its requirements
 
@@ -72,7 +72,7 @@ CPAN::Meta::Prereqs::Diff::Change - A dependency which changes its requirements
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 METHODS
 
@@ -106,7 +106,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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/lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm b/lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm
index 5b29241..6cb74f6 100644
--- a/lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff::Downgrade;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: A dependency which changes its requirements to an older version
 
@@ -52,7 +52,7 @@ CPAN::Meta::Prereqs::Diff::Downgrade - A dependency which changes its requiremen
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 METHODS
 
@@ -72,7 +72,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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/lib/CPAN/Meta/Prereqs/Diff/Removal.pm b/lib/CPAN/Meta/Prereqs/Diff/Removal.pm
index 91ea190..0a03c9b 100644
--- a/lib/CPAN/Meta/Prereqs/Diff/Removal.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff/Removal.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff::Removal;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: An unneeded dependency
 
@@ -63,7 +63,7 @@ CPAN::Meta::Prereqs::Diff::Removal - An unneeded dependency
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 METHODS
 
@@ -91,7 +91,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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/lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm b/lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm
index fd86660..49f57c8 100644
--- a/lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff::Role::Change;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: A base behavior for prerequisite changes
 
@@ -61,7 +61,7 @@ CPAN::Meta::Prereqs::Diff::Role::Change - A base behavior for prerequisite chang
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 ATTRIBUTES
 
@@ -93,7 +93,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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/lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm b/lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm
index 7967b48..e649dfe 100644
--- a/lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm
+++ b/lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package CPAN::Meta::Prereqs::Diff::Upgrade;
 
-our $VERSION = '0.001003';
+our $VERSION = '0.001004';
 
 # ABSTRACT: A dependency which changes its requirements to a newer version
 
@@ -52,7 +52,7 @@ CPAN::Meta::Prereqs::Diff::Upgrade - A dependency which changes its requirements
 
 =head1 VERSION
 
-version 0.001003
+version 0.001004
 
 =head1 METHODS
 
@@ -72,7 +72,7 @@ Kent Fredric <kentnl@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
+This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.
 
 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 d19e481..18fcb11 100644
--- a/misc/Changes.deps
+++ b/misc/Changes.deps
@@ -1,6 +1,10 @@
 This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test)
 
-0.001003
+0.001004
+ [Changed / test requires]
+ - Test::More 0.89 → 0
+
+0.001003 2015-07-16T20:41:42Z
  [Added / configure requires]
  - perl 5.006
 
diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all
index d874191..692a054 100644
--- a/misc/Changes.deps.all
+++ b/misc/Changes.deps.all
@@ -1,6 +1,23 @@
 This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop)
 
-0.001003
+0.001004
+ [Added / develop requires]
+ - English
+ - Software::License::Perl_5
+ - Test::MinimumVersion
+
+ [Changed / develop requires]
+ - Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902
+ - Test::More 0.88 → 0.96
+
+ [Changed / develop suggests]
+ - Dist::Zilla::App::Command::bakeini 0.002005 → 0.002006
+ - Dist::Zilla::PluginBundle::Author::KENTNL 2.025001 → 2.025021
+
+ [Changed / test requires]
+ - Test::More 0.89 → 0
+
+0.001003 2015-07-16T20:41:42Z
  [Added / configure requires]
  - perl 5.006
 
diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev
index 07ce608..3a4e51c 100644
--- a/misc/Changes.deps.dev
+++ b/misc/Changes.deps.dev
@@ -1,6 +1,20 @@
 This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL )
 
-0.001003
+0.001004
+ [Added / develop requires]
+ - English
+ - Software::License::Perl_5
+ - Test::MinimumVersion
+
+ [Changed / develop requires]
+ - Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902
+ - Test::More 0.88 → 0.96
+
+ [Changed / develop suggests]
+ - Dist::Zilla::App::Command::bakeini 0.002005 → 0.002006
+ - Dist::Zilla::PluginBundle::Author::KENTNL 2.025001 → 2.025021
+
+0.001003 2015-07-16T20:41:42Z
  [Added / develop recommends]
  - Test::More 0.99
 
diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt
index 672e871..9123da7 100644
--- a/misc/Changes.deps.opt
+++ b/misc/Changes.deps.opt
@@ -1,6 +1,8 @@
 This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test)
 
-0.001003
+0.001004
+
+0.001003 2015-07-16T20:41:42Z
  [Changed / configure recommends]
  - ExtUtils::MakeMaker 6.98 → 7.00
 
diff --git a/misc/built_with.json b/misc/built_with.json
index fea2d2a..7921a9e 100644
--- a/misc/built_with.json
+++ b/misc/built_with.json
@@ -1,92 +1,95 @@
 {
    "modules" : {
-      "CPAN::Meta" : "2.150005",
-      "CPAN::Meta::Prereqs" : "2.150005",
-      "CPAN::Meta::Requirements" : "2.133",
-      "Carp" : "1.36",
-      "Dist::Zilla" : "5.037",
-      "Dist::Zilla::App::Command::bakeini" : "0.002005",
-      "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : "0.001004",
-      "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.005001",
-      "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002",
+      "CPAN::Meta" : "2.150010",
+      "CPAN::Meta::Prereqs" : "2.150010",
+      "CPAN::Meta::Requirements" : "2.140",
+      "Carp" : "1.42",
+      "Dist::Zilla" : "6.008",
+      "Dist::Zilla::App::Command::bakeini" : "0.002006",
+      "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : "0.001005",
+      "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.005003",
+      "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001004",
       "Dist::Zilla::Plugin::Authority" : "1.009",
-      "Dist::Zilla::Plugin::AutoPrereqs" : "5.037",
-      "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.009",
-      "Dist::Zilla::Plugin::ConfirmRelease" : "5.037",
-      "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.151680",
-      "Dist::Zilla::Plugin::Git::Check" : "2.035",
-      "Dist::Zilla::Plugin::Git::Commit" : "2.035",
-      "Dist::Zilla::Plugin::Git::CommitBuild" : "2.035",
-      "Dist::Zilla::Plugin::Git::Contributors" : "0.011",
-      "Dist::Zilla::Plugin::Git::GatherDir" : "2.035",
+      "Dist::Zilla::Plugin::AutoPrereqs" : "6.008",
+      "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.015",
+      "Dist::Zilla::Plugin::ConfirmRelease" : "6.008",
+      "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.035",
-      "Dist::Zilla::Plugin::GithubMeta" : "0.52",
-      "Dist::Zilla::Plugin::License" : "5.037",
-      "Dist::Zilla::Plugin::MakeMaker" : "5.037",
-      "Dist::Zilla::Plugin::Manifest" : "5.037",
-      "Dist::Zilla::Plugin::ManifestSkip" : "5.037",
-      "Dist::Zilla::Plugin::MetaConfig" : "5.037",
-      "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004002",
-      "Dist::Zilla::Plugin::MetaJSON" : "5.037",
-      "Dist::Zilla::Plugin::MetaProvides::Package" : "2.003001",
-      "Dist::Zilla::Plugin::MetaTests" : "5.037",
-      "Dist::Zilla::Plugin::MetaYAML::Minimal" : "0.001000",
+      "Dist::Zilla::Plugin::Git::Tag" : "2.041",
+      "Dist::Zilla::Plugin::GithubMeta" : "0.54",
+      "Dist::Zilla::Plugin::License" : "6.008",
+      "Dist::Zilla::Plugin::MakeMaker" : "6.008",
+      "Dist::Zilla::Plugin::Manifest" : "6.008",
+      "Dist::Zilla::Plugin::ManifestSkip" : "6.008",
+      "Dist::Zilla::Plugin::MetaConfig" : "6.008",
+      "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004005",
+      "Dist::Zilla::Plugin::MetaJSON" : "6.008",
+      "Dist::Zilla::Plugin::MetaProvides::Package" : "2.004003",
+      "Dist::Zilla::Plugin::MetaTests" : "6.008",
+      "Dist::Zilla::Plugin::MetaYAML::Minimal" : "0.001001",
       "Dist::Zilla::Plugin::MinimumPerl" : "1.006",
-      "Dist::Zilla::Plugin::PodCoverageTests" : "5.037",
-      "Dist::Zilla::Plugin::PodSyntaxTests" : "5.037",
-      "Dist::Zilla::Plugin::PodWeaver" : "4.006",
-      "Dist::Zilla::Plugin::Prereqs" : "5.037",
-      "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0.004",
-      "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0.003001",
-      "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0.001000",
-      "Dist::Zilla::Plugin::Readme::Brief" : "0.002005",
-      "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.150250",
-      "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0.001000",
-      "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0.001005",
-      "Dist::Zilla::Plugin::RunExtraTests" : "0.027",
-      "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.009",
-      "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.003000",
-      "Dist::Zilla::Plugin::Test::EOL" : "0.18",
-      "Dist::Zilla::Plugin::Test::Kwalitee" : "2.11",
-      "Dist::Zilla::Plugin::Test::MinimumVersion" : "2.000006",
+      "Dist::Zilla::Plugin::PodCoverageTests" : "6.008",
+      "Dist::Zilla::Plugin::PodSyntaxTests" : "6.008",
+      "Dist::Zilla::Plugin::PodWeaver" : "4.008",
+      "Dist::Zilla::Plugin::Prereqs" : "6.008",
+      "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.021",
-      "Dist::Zilla::Plugin::TestRelease" : "5.037",
+      "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0.025",
+      "Dist::Zilla::Plugin::TestRelease" : "6.008",
       "Dist::Zilla::Plugin::Twitter" : "0.026",
-      "Dist::Zilla::Plugin::UploadToCPAN" : "5.037",
-      "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025001",
-      "ExtUtils::MakeMaker" : "7.04_01",
-      "File::Spec" : "3.56",
-      "Moo" : "2.000001",
-      "Moo::Role" : "2.000001",
+      "Dist::Zilla::Plugin::UploadToCPAN" : "6.008",
+      "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025021",
+      "English" : "1.10",
+      "ExtUtils::MakeMaker" : "7.24",
+      "File::Spec" : "3.66",
+      "Moo" : "2.003000",
+      "Moo::Role" : "2.003000",
       "Pod::Coverage::TrustPod" : "0.100003",
-      "Scalar::Util" : "1.42_002",
+      "Scalar::Util" : "1.46_02",
+      "Software::License::Perl_5" : "0.103012",
       "Test::CPAN::Changes" : "0.400002",
       "Test::CPAN::Meta" : "0.25",
-      "Test::EOL" : "1.5",
-      "Test::Kwalitee" : "1.22",
-      "Test::More" : "1.001014",
-      "Test::Pod" : "1.50",
+      "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",
-      "strict" : "1.09",
-      "version" : "0.9912",
-      "warnings" : "1.32"
+      "strict" : "1.11",
+      "version" : "0.9917",
+      "warnings" : "1.37"
    },
    "perl" : {
-      "original" : "v5.22.0",
+      "original" : "v5.25.10",
       "qv" : 1,
       "version" : [
          5,
-         22,
-         0
+         25,
+         10
       ]
    },
    "perl-config" : {
-      "gccversion" : "4.9.2",
+      "gccversion" : "5.4.0",
       "myarchname" : "x86_64-linux",
       "osname" : "linux"
    },
    "platform" : "linux",
-   "uname" : "Linux 4.1.0-gentoo-r1 x86_64 GenuineIntel GNU/Linux"
+   "uname" : "Linux 4.8.5-gentoo x86_64 GenuineIntel GNU/Linux"
 }
diff --git a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Addition_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Addition_pm.t
index 27ca86f..f756a27 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Addition_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Addition_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff/Addition.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff/Addition.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 = "CPAN/Meta/Prereqs/Diff/Addition.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-compile/lib_CPAN_Meta_Prereqs_Diff_Change_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Change_pm.t
index 08edc70..fa0e1b1 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Change_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Change_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff/Change.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff/Change.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 = "CPAN/Meta/Prereqs/Diff/Change.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-compile/lib_CPAN_Meta_Prereqs_Diff_Downgrade_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Downgrade_pm.t
index 6fcd76e..0937ebb 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Downgrade_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Downgrade_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff/Downgrade.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff/Downgrade.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 = "CPAN/Meta/Prereqs/Diff/Downgrade.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-compile/lib_CPAN_Meta_Prereqs_Diff_Removal_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Removal_pm.t
index e75da55..7e7b104 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Removal_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Removal_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff/Removal.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff/Removal.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 = "CPAN/Meta/Prereqs/Diff/Removal.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-compile/lib_CPAN_Meta_Prereqs_Diff_Role_Change_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Role_Change_pm.t
index 79fff14..20471df 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Role_Change_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Role_Change_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff/Role/Change.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff/Role/Change.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 = "CPAN/Meta/Prereqs/Diff/Role/Change.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-compile/lib_CPAN_Meta_Prereqs_Diff_Upgrade_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Upgrade_pm.t
index f0b43e9..28e4eef 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Upgrade_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_Upgrade_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff/Upgrade.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff/Upgrade.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 = "CPAN/Meta/Prereqs/Diff/Upgrade.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-compile/lib_CPAN_Meta_Prereqs_Diff_pm.t b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_pm.t
index d6955ea..d9e3804 100644
--- a/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_pm.t
+++ b/t/00-compile/lib_CPAN_Meta_Prereqs_Diff_pm.t
@@ -1,11 +1,17 @@
-use strict;
-use warnings;
-
 # This test was generated for <lib/CPAN/Meta/Prereqs/Diff.pm>
-# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000
-# with template 01-basic.t.tpl
-
-use Test::More 0.89 tests => 1;
-
-require_ok("lib/CPAN/Meta/Prereqs/Diff.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 = "CPAN/Meta/Prereqs/Diff.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 478b1a3..bc5e1bc 100644
--- a/t/00-report-prereqs.dd
+++ b/t/00-report-prereqs.dd
@@ -54,7 +54,7 @@ do { my $x = {
                                       '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',
@@ -63,18 +63,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::EOL' => '0',
                                       'Test::Kwalitee' => '1.21',
-                                      'Test::More' => '0.88',
+                                      'Test::MinimumVersion' => '0',
+                                      'Test::More' => '0.96',
                                       'Test::Pod' => '1.41',
                                       'Test::Pod::Coverage' => '1.08'
                                     },
                       'suggests' => {
-                                      'Dist::Zilla::App::Command::bakeini' => '0.002005',
-                                      'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.025001'
+                                      'Dist::Zilla::App::Command::bakeini' => '0.002006',
+                                      'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.025021'
                                     }
                     },
        'runtime' => {
@@ -101,7 +104,7 @@ do { my $x = {
                                    'CPAN::Meta' => '0',
                                    'ExtUtils::MakeMaker' => '0',
                                    'File::Spec' => '0',
-                                   'Test::More' => '0.89',
+                                   'Test::More' => '0',
                                    'perl' => '5.006'
                                  }
                  }
diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t
index d8d15ba..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.021
+# 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';
diff --git a/t/basic.t b/t/basic.t
index 7b5ebe7..dc15ebd 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -2,90 +2,98 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 27;
 
 use CPAN::Meta::Prereqs::Diff;
 
-subtest "Addition" => sub {
+our $context = "";
+
+sub my_subtest ($$) {
+
+  #note "Beginning: $_[0] ]---";
+  local $context = " ($_[0])";
+  $_[1]->();
+
+  #note "Ending: $_[0] ]---";
+}
+
+my_subtest "Addition" => sub {
   my $diff = CPAN::Meta::Prereqs::Diff->new(
     new_prereqs => { runtime => { requires => { "Some::Dependency" => "1.0" } } },
     old_prereqs => { runtime => { requires => {} } },
   );
   my @diffs = $diff->diff;
   is( scalar @diffs, 1, "1 Diff" );
-  ok( $diffs[0]->is_addition, "Is addition" );
-  ok( !$diffs[0]->is_removal, "Not removal" );
-  ok( !$diffs[0]->is_change,  "Not change" );
+  ok( $diffs[0]->is_addition, "Is addition$context" );
+  ok( !$diffs[0]->is_removal, "Not removal$context" );
+  ok( !$diffs[0]->is_change,  "Not change$context" );
   note $diffs[0]->describe;
 };
-subtest "Removal" => sub {
+my_subtest "Removal" => sub {
   my $diff = CPAN::Meta::Prereqs::Diff->new(
     old_prereqs => { runtime => { requires => { "Some::Dependency" => "1.0" } } },
     new_prereqs => { runtime => { requires => {} } },
   );
   my @diffs = $diff->diff;
   is( scalar @diffs, 1, "1 Diff" );
-  ok( !$diffs[0]->is_addition, "Not addition" );
-  ok( $diffs[0]->is_removal,   "Is removal" );
-  ok( !$diffs[0]->is_change,   "Not change" );
+  ok( !$diffs[0]->is_addition, "Not addition$context" );
+  ok( $diffs[0]->is_removal,   "Is removal$context" );
+  ok( !$diffs[0]->is_change,   "Not change$context" );
   note $diffs[0]->describe;
 
 };
-subtest "No Change" => sub {
+my_subtest "No Change" => sub {
   my $diff = CPAN::Meta::Prereqs::Diff->new(
     old_prereqs => { runtime => { requires => { "Some::Dependency" => "1.0" } } },
     new_prereqs => { runtime => { requires => { "Some::Dependency" => "1.0" } } },
   );
   my @diffs = $diff->diff;
-  is( scalar @diffs, 0, "0 Diffs" );
+  is( scalar @diffs, 0, "0 Diffs$context" );
 
 };
-subtest "Change upgrade Change" => sub {
+my_subtest "Change upgrade Change" => sub {
   my $diff = CPAN::Meta::Prereqs::Diff->new(
     old_prereqs => { runtime => { requires => { "Some::Dependency" => "0.9" } } },
     new_prereqs => { runtime => { requires => { "Some::Dependency" => "1.0" } } },
   );
   my @diffs = $diff->diff;
-  is( scalar @diffs, 1, "1 Diffs" );
-  ok( !$diffs[0]->is_addition, "Not addition" );
-  ok( !$diffs[0]->is_removal,  "Not removal" );
-  return unless ok( $diffs[0]->is_change, "Is change" );
-  ok( $diffs[0]->is_upgrade,    "Is Upgrade" );
-  ok( !$diffs[0]->is_downgrade, "Not Downgrade" );
+  is( scalar @diffs, 1, "1 Diffs$context" );
+  ok( !$diffs[0]->is_addition, "Not addition$context" );
+  ok( !$diffs[0]->is_removal,  "Not removal$context" );
+  return unless ok( $diffs[0]->is_change, "Is change$context" );
+  ok( $diffs[0]->is_upgrade,    "Is Upgrade$context" );
+  ok( !$diffs[0]->is_downgrade, "Not Downgrade$context" );
   note $diffs[0]->describe;
 
 };
-subtest "Change downgrade Change" => sub {
+my_subtest "Change downgrade Change" => sub {
   my $diff = CPAN::Meta::Prereqs::Diff->new(
     old_prereqs => { runtime => { requires => { "Some::Dependency" => "1.0" } } },
     new_prereqs => { runtime => { requires => { "Some::Dependency" => "0.9" } } },
   );
   my @diffs = $diff->diff;
-  is( scalar @diffs, 1, "1 Diffs" );
-  ok( !$diffs[0]->is_addition, "Not addition" );
-  ok( !$diffs[0]->is_removal,  "Not removal" );
-  return unless ok( $diffs[0]->is_change, "Is change" );
-  ok( !$diffs[0]->is_upgrade,  "Not Upgrade" );
-  ok( $diffs[0]->is_downgrade, "Is Downgrade" );
+  is( scalar @diffs, 1, "1 Diffs$context" );
+  ok( !$diffs[0]->is_addition, "Not addition$context" );
+  ok( !$diffs[0]->is_removal,  "Not removal$context" );
+  return unless ok( $diffs[0]->is_change, "Is change$context" );
+  ok( !$diffs[0]->is_upgrade,  "Not Upgrade$context" );
+  ok( $diffs[0]->is_downgrade, "Is Downgrade$context" );
   note $diffs[0]->describe;
 
 };
 
-subtest "Change mixed Change" => sub {
+my_subtest "Change mixed Change" => sub {
   my $diff = CPAN::Meta::Prereqs::Diff->new(
     old_prereqs => { runtime => { requires => { "Some::Dependency" => "<1.0" } } },
     new_prereqs => { runtime => { requires => { "Some::Dependency" => ">0.9" } } },
   );
   my @diffs = $diff->diff;
-  is( scalar @diffs, 1, "1 Diffs" );
-  ok( !$diffs[0]->is_addition, "Not addition" );
-  ok( !$diffs[0]->is_removal,  "Not removal" );
-  return unless ok( $diffs[0]->is_change, "Is change" );
-  ok( !$diffs[0]->is_upgrade,   "Not Upgrade" );
-  ok( !$diffs[0]->is_downgrade, "Not Downgrade" );
+  is( scalar @diffs, 1, "1 Diffs$context" );
+  ok( !$diffs[0]->is_addition, "Not addition$context" );
+  ok( !$diffs[0]->is_removal,  "Not removal$context" );
+  return unless ok( $diffs[0]->is_change, "Is change$context" );
+  ok( !$diffs[0]->is_upgrade,   "Not Upgrade$context" );
+  ok( !$diffs[0]->is_downgrade, "Not Downgrade$context" );
   note $diffs[0]->describe;
 
 };
-
-done_testing;
-
diff --git a/t/constructors.t b/t/constructors.t
index 2b67ec3..da18627 100644
--- a/t/constructors.t
+++ b/t/constructors.t
@@ -1,15 +1,25 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 3;
 
 # ABSTRACT: Test alternative contstructor args
 
 use CPAN::Meta::Prereqs::Diff;
 use CPAN::Meta::Prereqs;
 use CPAN::Meta;
+our $context = "";
 
-subtest "Explicit Prereqs object" => sub {
+sub my_subtest ($$) {
+
+  #note "Beginning: $_[0] ]---";
+  local $context = " ($_[0])";
+  $_[1]->();
+
+  #note "Ending: $_[0] ]---";
+}
+
+my_subtest "Explicit Prereqs object" => sub {
   my $prereqs = CPAN::Meta::Prereqs->new( { runtime => { requires => { "Foo" => "1.0" } } } );
 
   local $@;
@@ -22,10 +32,10 @@ subtest "Explicit Prereqs object" => sub {
     my @items = $diff->diff();
     $lives = 1;
   };
-  ok( $lives, "Did not bail" ) or diag explain $@;
+  ok( $lives, "Did not bail$context" ) or diag explain $@;
 };
 
-subtest "Explicit CPAN::Meta object" => sub {
+my_subtest "Explicit CPAN::Meta object" => sub {
   my $meta = CPAN::Meta->create(
     {
       prereqs        => { runtime => { requires => { "Foo" => "1.0" } } },
@@ -49,10 +59,10 @@ subtest "Explicit CPAN::Meta object" => sub {
     my @items = $diff->diff;
     $lives = 1;
   };
-  ok( $lives, "Did not bail" ) or diag explain $@;
+  ok( $lives, "Did not bail$context" ) or diag explain $@;
 };
 
-subtest "Invalid" => sub {
+my_subtest "Invalid" => sub {
   local $@;
   my $lives = 0;
   eval {
@@ -64,8 +74,5 @@ subtest "Invalid" => sub {
     my @items = $diff->diff;
     $lives = 1;
   };
-  ok( !$lives, "Did bail" ) and note $@;
+  ok( !$lives, "Did bail$context" ) and note $@;
 };
-
-done_testing;
-
diff --git a/t/realworld.t b/t/realworld.t
index 1fec93b..608161f 100644
--- a/t/realworld.t
+++ b/t/realworld.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 2;
 
 use CPAN::Meta::Prereqs::Diff;
 my $new_prereqs = {
@@ -98,24 +98,31 @@ my $diff = CPAN::Meta::Prereqs::Diff->new(
   new_prereqs => $new_prereqs,
   old_prereqs => $old_prereqs,
 );
+our $context = "";
 
-subtest "Basic" => sub {
+sub my_subtest ($$) {
+
+  #note "Beginning: $_[0] ]---";
+  local $context = " ($_[0])";
+  $_[1]->();
+
+  #note "Ending: $_[0] ]---";
+}
+
+my_subtest "Basic" => sub {
   my $i = 0;
   for my $diff_entry ( $diff->diff ) {
     note $diff_entry->describe;
     $i++;
   }
-  is( $i, 5, '5 differences with basic settings' );
+  is( $i, 5, "5 differences with basic settings$context" );
 };
 
-subtest "Develop" => sub {
+my_subtest "Develop" => sub {
   my $i = 0;
   for my $diff_entry ( $diff->diff( phases => [qw( configure build runtime test develop )] ) ) {
     note $diff_entry->describe;
     $i++;
   }
-  is( $i, 16, '5 differences with develop deps' );
+  is( $i, 16, "5 differences with develop deps$context" );
 };
-
-done_testing;
-
diff --git a/xt/author/eol.t b/xt/author/eol.t
index eaaa7e7..62596f8 100644
--- a/xt/author/eol.t
+++ b/xt/author/eol.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.18
+# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.19
 
 use Test::More 0.88;
 use Test::EOL;
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/kwalitee.t b/xt/release/kwalitee.t
index bcbce84..c986546 100644
--- a/xt/release/kwalitee.t
+++ b/xt/release/kwalitee.t
@@ -1,4 +1,4 @@
-# this test was generated with Dist::Zilla::Plugin::Test::Kwalitee 2.11
+# this test was generated with Dist::Zilla::Plugin::Test::Kwalitee 2.12
 use strict;
 use warnings;
 use Test::More 0.88;