Your description of the FI skill test Whopity sounds much closer to what I took (as a CRI skill test) than your description of the CRI skill test.
My brief was that I had a lapsed pilot, who had already failed their revalidation by test, and given a list of deficiencies to "sort out" - including stalling, PFLs and circuits. I also had to do two briefs (one for circuits, one for PFLS and stalling), two debriefs, and a long brief on a topic I was given the day before (I got W&CG). In between was a fairly wide variety of mostly quite deep questions on licencing, good practice, and so-on that went fairly deeply into my CPL knowledge.
Checking my logbook, it was about 1:50 flying, and from memory about another 4 hours on the ground.
Class conversion really didn't feature in it to be honest. On the other hand, it was certainly relevant to much of what I've done as an instructor since and I have no complaints.
G