Thanks for the reply crackjack.
We are on one ticket (on SQ) and what you proposed was what I was initially intending, however looking at the US entry requirements I thought the test needed to be within 1 day of the last flight (going into the US).
Can anyone confirm that's not the case? As mentioned above would certainly make life easier....