I was in a similar boat. I started to drill from PT 1-PT18 (old format) since those PTs aren't included in the new PTs. One can argue that it is not the best option since they are older tests, but the questions are still testing the same set of skills.