If you can afford a software called CompassTest or Pilapt from Skytest buy it..sure it will help you a lot. Most selection tests are based on them.
I do also recommend the CBTs you already have but don't only stick on them because it's just not enough and also some subjects may not even be in the test or you don't need to revise them.
The software mentioned above will give you a better idea of the structure of the actual test.
Good Luck!