Yeah, I did my renewal under Part 61 a few weeks ago.
As I understand it, to cover the lot you need:
3D (ILS or RNP) and 2D (LOC, VOR, NDB, or RNAV)
CDI (ILS, LOC, VOR or RNAV) and Azimuth (RMI, fixed card NDB, or DME/GPS arrival using the NDB for azimuth guidance)
Plus the usual partial panel, steep turns, recoveries from unusual attitudes, and a circling appr.
I also flew it all in the aeroplane.
Dr 
PS: And then you might as well get a sign off on your PIFR as well - Ha! Don't ask!