FileSystem now returns file names, rather than full paths. +Test