Test fixes after rewording