Test fixes

Small stuff.

Fixed a race condition and stopped the the daemon that made `cake test` hang on my box.

—Tim