Remove test env deprecation warning
Fix production deprecation warning