Yes - now that the first FI revalidation must be by test, it would make sense to re-introduce the old AFI to FI upgrade test. Not 'Q'FI, by the way!!
The IRI requirements to remove the 'No applied IF instruction' limitations on a FI rating are well spelled out in LASORS Section H - go to
www.srg.caa.co.uk and look for the site. Note that there are lower IF experience requirements if you just want to teach for the IMC Rating rather than the IR.