fix cucumber scenarios