Trying to avoid bizarre test errors