Fix Timo's tests with new environment variables.