We are using the model that you suggest Victoria.
Old AQA short answer questions and essay questions from the Paper 1 (GGA1) for Ecosystems and Tectonics from (GGA4); Worlds Cities from the old (GGA2) and Devewlopment from (GGA5) with some tweaking.
Several of these are still available on the AQA website,