Fixed the functional tests and dependency injection file.