DI: add new tests, fixes