Added the functional tests and the dependency injection fil.