Well, yesterday I took the Audi back in for its retest - it failed on anti-roll bar bushes, one CV boot and front discs, so all easy things to check, and got quickly checked over and a new ticket handed to me within a couple of minutes.
Then I asked how busy he was today as my newly-bought Seat Inca van is coming up for its first MOT - he says to come back later in the afternoon, which I do, then he's got two more to do so I pop back in an hour and it gets tested. Fails, but only on having no sidelights or number plate lights. One of the number plate lights came on just as I was unscrewing the bulb-holder, but the other 3 needed replacing. They supplied the bulbs, I changed them over, and despite having to take half of the front end off to get to one of the sidelights (passenger side, battery v.close to headlight unit) - well, just the front grille which is the whole width of the van, and clips into both wings, it only took a couple of minutes. Job done. Never had an MOT so easily! I'm a happy bunny.
Peter