Several improvements and disentanglements to DepthFirstTest.