EDCM testing improvements.