Split some tests, and leave tracer code to debug travis failures