Add missing executor-based functional tests (see #1799 instead)

Add missing executor-based functional tests (see #1799 instead) #2177