Added more instrumentation to help debug the test2 issue