Make testing a little bit more robust.