Fixups after merge
Improve testing regexps
Replace File::Slurp with Path::Tiny
Add shebang line to t/too-soon.t