Never mind -- things are still borked =(
Updating tests to always work on a clean disk