Completed dependencyinjection.json and functional tests
Merge pull request #2 from Nitrofski/master

Completed dependencyinjection.json and functional tests