Fix shell tests