Change all list scenarios to have list structure