Get tests passing reliably again