Rewrite - Remove the two passes

I would like to see if is it possible to remove the two passes (before/after the patches).

In most of the cases the tests could be only run on the of the patches.

The tool is slow, and also unreliable with files removed/moved.