Add some more logging and associated tests.