Refactoring of OrchestratorTest
Implementation of the OneToOne error handling strategy
Correstion of bugs related to OrchestratorTest