Fixes to broken caplog tests.

6 jobs for master in 7 minutes and 25 seconds (queued for 1 second)