After reworking DI-loader, the tests now pass ( :O !).

 + Will need to refactor in the new DI-ways, just good that the
   tests pass!
Now we remove old DI!