More lossy-tolerant test tweaks