This patch fixes things so that the test suite passes when being run during the build process (and only the build process). It's needed in addition to the previous 9 (and is in my git branch). - Matt