ACCUMULO-802 Make tests pass