Some test improvements. Daemons do not work well with coverage.