Fixed the functional tests and the DI file.