And to finish this up. When I applied for the Thai Pass I had to pay for two PCR tests. Upon arrival in HKT we were advised that the second PCR was no longer necessary and to apply for a refund. I forgot.

I applied last night and within 24 hours the refund was applied to my credit card.