Rewrote the test tool to be more OO then F.
Rewrote the test tool to be more OO then F.