Fixed FilePath.Defrag and added test