Fixed + ROI.

Now it actually works.  Integrated ROI into it at the ground level; it
sped up tests a little bit [around 3 - 4 seconds for just two tests on
average], but will continue to look into ROI stuff.