Thanks for the update.  I can relate.  Sometimes rewriting is vanity work, and sometimes the original authors were unclear on the concept.  Having a test framework is 80% of the battle - so you are in good shape.