Test and debug interface improvements part 2

No match.