I cross checked this with RAA today. The CFI has the decision to use 4 or 5 exams. HF is now incorporated into all 4 exams. HF remains its own exam to allow students part way through to continue and do HF as a separate exam. It is the CFI's decision depending on progress as to whether they are required to do a separate HF exam or not.