BEagle - I'll drop a not to the CFE about the renewal requirement for PPL FEs, but (and I haven't checked) I assume that this is regulated by JAR so I doubt that he will have the freedom to make changes, even if he agrees.
Ref the test sequence - what's your objection to a radnav fix during the diversion? Surely this is a sensible way for them to verify the tracking and demonstrates that they can use the kit.
HFD