I don't know the exact names of the lanterns I took at Gatwick-but it must have been Beynes and Holmes-wright(I think. I didn't ask at the time as I didn't realise I had a problem until they told me at the end of the testing that I'd failed!)
Yes, the CAA had already put on my licence and medical that I was restricted to daytime flights only. After sending my results from Spiez to the CAA, they sent me back my new licence and medical without restriction.
Good luck at city uni!