Merge "Revert "Superficial improvements to ZOrderingTest.""