File Formatting
Remove Test Environment Detection