More fixing of tracing more tests to simulate problem cases