Add more debug instrumentation to failing test