(hopefully) fix non-deterministic test failures