How do I handle the Thailand Pass application for a layover if I'm leaving before the second COVID test is due?

I plan in traveling from Phnom Penh to Cairo with a transit in BKK. I haven’t found any flights that will allow my baggage to be checked through at BKK, so I’ll have to go through immigration to collect my bags and then recheck for the departing flight. This neans, I think, that I’ll have to get a new Thailand Pass, spend the night at a BKK SHA+ hotel and then continue on to Cairo the next day.

I obviously won’t need the second covid test that now is required for people who will stay in Thailand. Does the Thailand Pass system now contemplate this as a possibility? How do you handle the Thailand Pass application if you will leave the country before the second test is due? Will the SHA+ hotels book you for just 1 test rather than 2 if you’re leaving right away?