Added functional tests and fixed dependencyinjection.json