Get back code coverage on DI component
Improve tests for DI component

Coverage was at 100%, but everything wasn't actually tested.
Yada yada… standards.