Rearrange a few test suites.