HM/JPM: fixed tests