Test suite updates for the @SHELL@ change: