Hi Lads. I have OEM xenons retrofitted on a 2002 325. I know they are failing cars now if you do not have washers installed and self leveling

What would be the easiest and best way for me to pass the NCT?

Swap out the xenons for the test with regular headlights and then reinstall the xenons? Would I need to get this flashed twice?

Or

Try and retrofit the washers and self levelling. Washers should be easy enough but I'm not sure about the self levelling? Have sourced the parts for the washers just trying to decide whether to buy them or not