Test and debug interface improvements part 2