Adding more env tests