P1u/s for your skill tests will count towards your P1 time but it's not going to total 16 hours though.
All my CPL time was Pu/t (dual instruction) and I think it's the same for an IR course. Looks like you need a few more hours. You could always do these whilst you're on your CPL course (but not part of the course) in your spare time
Cheers
Whirls