Reenabled correct sorting, all tests pass