DependencyInjection is now fully tested and slightly tweaked with found bugs.