Treat http and https as equivalent during discovery
Add missing tests to standard group