Refactor execution plan test