Fixed dependencyinjection.json and functional tests