Reorder methods and tests to match docs