@Rob *******
Yeah it seems increasingly like it's a bad idea.
A quick google search in your area for an ATK provider for travel purposes usually works. I did in UK and had results in a couple of hours with a a certificate.
Not sure with the ThaiPass going away whether it can be done on arrival and you bring your own test.