Add scenarios and tweak warnings to not show up often