Revert "Speculative revert of "- Move test cases for more natural ordering.""

Did not resolve the build bot issue.

This reverts commit 02d283a6ff5364d94aa88f5f5df4cfd3a5411346.

BUG=
TBR=solenberg@webrtc.org

Review URL: https://codereview.webrtc.org/1324123002

Cr-Commit-Position: refs/heads/master@{#9849}
4 files changed