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