Clean up properly after DistanceTest

One more ordering dependency. That's all of them, right???