FilePath method normalized refactor and new tests