am 304d6981: Merge "Fix unit tests now that the "tl" -> "fil" hack is gone."

* commit '304d69812c6d126d23125439c1d70b6210b907a9':
  Fix unit tests now that the "tl" -> "fil" hack is gone.