Fix more tracing tests