PCR and ATK test are available at little cost (ATK 250 THB with certificate, PCR 1200 if memory serves me right) and short waiting times at Suvarnabhumi airport. Details see Richard Barrow, from whom I know.