Organized the test traces some more.
More test trace improvements.