Splitting out the two main testing modes, to more easily test stuff.
Adding rank information to the digests