Better tests with Orchestra/Testbench and refactorized repository