Got my retest thursday a'noon. Only a needed a new O/S Headlight as the adjuster had broke, and clean up of the wires to the dipped beam on the N/S as it had corroded. I was well happy with that as I was pretty nervous. I had changed rear discs/pads/bearings, 2 front tyres, clean up and paint the brake lines, and had to straighten out and underseal the O/S sill in preperation though.