rm spurious call to FilePath, more tests