Revert "Superficial improvements to ZOrderingTest."

This reverts commit 515a40a14980f0df908a0a08c3220854beee8c14.

Reason for revert: CL Earlier in chain causes 71736995

Change-Id: Id1fc0edcad15aa2d785a911a782a05bb6b5766a9
1 file changed