Fixing executor test problems