Fix more test stuff. Now includes depends/settings and depends/util.