Updates to enable to recorded scenario tests