It works!  Wired up 2 x 4021 shift registers and I can now pass the Nintendo Controller test :-)