Full test and implementation IoC / DI completed