#: dfs u-tests and fix