Improvements to integration test & logging

Integration was failing for me at head; but partway through figuring it out I had to reboot my computer and now the problem is gone. Still, these changes are improvements.