ACCUMULO-2170 Add the new test fix