PIM-3054: Change scenarii to make them fit with changes