Runtime-detection: Added support for EAP-6.1 testing