Stabilized rich:column sort test, adjusted the way sort type is selected