Added some tests for Dir, not finished yet