Further flattening of trace and a few corrections and demoer/tester.
Timing issue with allcorrect, sometimes he gets 110 and sometimes 120. I
suspect the time out has to be increased for running test.