More tracetest cleanup and fixes