Fixed env and product tests..