Update spec to ensure env variable is unset
Extend timeout for tests