Add a method a directories for convience
Added some more tests for expand path