It was getting way too ad-hoc in there. Let's reorganize the tests so that there's a good, obvious, suggested sequence to run them in.
This lets us move t/default.do out of the way; it was confusing otherwise.