Test suite fixes after env.update() change.