Fixed testing, ready to place on CPAN