Clean up after disk tests
Fix some deadlocks discovered in swarm tests
Merge pull request #42 from c00w/master

Testsuite cleanups