Organized the test traces some more.

Will help in investigating failing tests.