Fixes for EHC portal testing