tests: TPF_60_* bug fixes
6 files changed