Shuffle tests around.
Merge pull request #2 from jerith/rearrange-tests

Shuffle tests around.