Completed dependencyinjection.json and functional tests