Remove sort from log and all tests