Modify scenario and fix reform

@eraviart : could you check if these modifications suits you ? Thanks.