Runtime-detection: Added support for testing EAP-6.1