orchestrator: Fix multiple bugs so testsuite finally passes