b0f491d3c3
- Fix test failures on new fish 2.2.0 - Make timeout-based test cases more robust
- Fix test failures on new fish 2.2.0 - Make timeout-based test cases more robust