More test trace improvements.