Commit c800b2d8 changed some logging from verbose to debug and this test needed corresponding changes. There were some other problems in the test that I also fixed.
