TPlan updates for latest test runner