Clean up after disk tests
Fix some deadlocks discovered in swarm tests