DI 2.0.0

There is no additional test for this right now, though it generates the factories for the main test.