Fixed BatchTasks tests, updated codebase for f1 and f1a to dl