Basically your bang on.. I swapped the lambda from my seiT which i know works (will replace with a wideband). I checked all the management sensors worked correctly with a multimeter and stuck a new air filter on it. And damn good thrashing 20 or so miles on way to test station.
I also got the nice man to do emissions as soon as i arrived while the CAT was nice and hot.