ACCUMULO-378 More test stabilization