Y-316: provided more diagnostics in test.