Clean up DFS tests