Don't leave large blocks of code commented out.  Just remove the whole block.  If we get rid of this, we may only run the tests from the tests dir, btw.