Wait for WAL collector in a few more waitUnload.

This is necessary for some of the slower unittests (for example with
code coverage or valgrind).