Fixed controlplanedao test
removed dfs tests as they are no longer valid or usable