Fix test order to match comments