Fix scenario tests failure