Getting rid of a non-deterministic test