ENV.shift specs need to save/restore ENV in a couple more places