Expand dependency injection test coverage

Change-Id: I381bfb8c0f777d421b5cf0a4c1d1ef38486e1b59
Merge "Expand dependency injection test coverage"