r13272: Re-arrange so all the normal tests we can pass come first.