- Added some more debug output to track down some of the test failures.