Simplified environment handling
Environment is now enum; Test now work