In the older versions they have a separate review pages book and test book. In the new editions, are any of these combined in the student text? It is kind of irritating to have to pull all the different sheets out and stuff them in the student book... my son tends to drop them out a bit. Thanks!