Added FS tests + renamer fixes