I read on another forum that NHS travel clinics are doing 24 hour test at £100 . You have to phone your local hospital and ask for the travel clinic. Saw a few people use the service who were going back to Cambodia
In the past the visa was put in your passport when you arrived in BKK, i don't know if it's put in with the date you paid or the date it was put in the passport