HHH-8969 removed deprecated annotations
HHH-8827 corrected @SortNatural and @SortComparator, test case
HHH-8969 corrected test failures