Reorder some tests and fix some text.