Re-arrange cases to be alphabetical
Update vignette to include expand_scenarios