Code cleanup while testing DIContainerTest ++