fix to scenario tests