ACCUMULO-658 Move test and utils to correct packages