Remove tracing, cleanup test