IoC container mods + unit tests