Reduce code duplication in DI extensions
Fix broken specs