Reorganize the tests to be in the same order as the implementation.