What you mentioned should cover the better part of the questions in the exam.
However, the test tend to include 5-10 questions from the following: abstract algebra, set theory, complex analysis, probability, point set topology, measure theory. There are a few more topics like algorithms, graph theory, numerical analysis and such, that are more esoteric.
I would recommend taking a course in complex analysis, but for the rest of the topics, just learn the material while practicing questions.
I hope this help...