merging #2603 Some tests don't work in eshell