Changes to functional tests for new dl directory structure.