TBH they did have a lot of relevant modern questions, but there were so many non-relevant questions in the test. I agree with the others who posted here that it's important to know the history of the country, but some of them were so detailed and granular, you would say "why do I need to know this?" General history and details should be enough IMHO.I tend to agree with you. Something more akin to a GCSE in citizenship would be my idea. Things like what is require for you to drive I. The UK. What are your obligations if you suspect (or know) criminal activity is taking place? What is the penalty for forcing FGM? What are the penalties for being in possession of illegal drugs? What are the penalties for carrying offensive weapons?
Things might have changed now, remember this was the test I took just over 5 years ago.