Made changes to get the mocked executions running