TODO removal part 1 - ActionExecutorTests