Let's see what happens. I'm hoping to make a trip to BKK in beginning of June (not the 1st thou). I hope entry testing would ease out even more than now, but as it's communicated much depends on Songkran and it's aftermath.