Simplify DFS tests