I recommend checking with the AAT directly or exploring reputable online resources that offer study materials and practice questions.
Regarding your question about units 30 and 31, they may cover similar areas of study, but it’s best to review the syllabus or course outline provided by your learning institution or the AAT to ensure you’re covering all the necessary topics.