This tries to add black box tests for most common scenarios for a few executors.
It fixes two small bugs.