Fix #2285 (tut, e2e): fixed e2e and extended tut for external sort