tests: TFI build fixes
6 files changed