Possible fix to intermittent failing test