changed load to allow loading EP and EH together
updated hqmf2js to latest
protected from NPE out of tests