Trying to fix some randomly breaking tests. :-/