#1 enhance executor test