Yes you are correct. From a popular ATOs mouth on the subject all FIR upgrades will be separate tests. As for can you do more than one at a time it depends on your preferred ATO. Even now most will not do multiple ticks on the same day even though the ATOM says they can.
So if you have the hours go and get the PMI out of the road and get it done.