Also added a short circuit for the regression test suite since CVS
insisted on putting this file in the main branch. :(