[DependencyInjection] Update dumpers and loaders, add unit tests