Revamped citizenship test focuses more on concepts