... which were making other, innocent, tests, fail. Plus remove a spurious unittest.DEBUG which was making the output noisy.