Added DI containers + tests