Yes. I called up and asked to book that test specifically and that was that. Apparently, once you pass, you're home and dry for good and will never be retested and hence never again will your defect come back to haunt you. At least, that's what I was told, but I fear the treachery of the JAA.
I have a question about HW. Are the lights supposed to be the same for each colour or do they vary?