Replaced tracing with testing as appropriate