Added new case for test, removed tracing