Fix shell integration tests