Revert to previous test structure + updated regexp. Changed regexp did not validate all needed test cases.
isocheck/trunk/Tools.pm