Added DirExpect and SymDirExpect to util package