Change some assertions in Executor component