EG/HM: wip fixing tests