Fix scenario tests