Fixed the DI file and functional tests.