Test cleanup

[bieron]

this regex is already pretty long and complicated, if you ever want to change it, you can do it in one place. It also prevents making any typos when adding new cases.

also, trivial cpanfile update

P.S. http://cpan-prc.org/