ShellOrchestrator with direct config, tests updated