Fixed the dependency injection file and added the functional tests