Added some instrumentation to try and narrow down the test2 problem