Added tests to EHF 2.0