Some more places where environment needs testing