Default sorting tests & small fix