Started fixing the sorting tests to obtain compilation.