for new Test & Go,, many hotels offer also 5 days package....something like a Sandbox light
they add to the day 1 and 5 package (transfer, 2 accommodation, 2 PCR test) just 3 nights accommodation without any restrictions...usually at very basic rates, less than 2000 THB for 5* accommodation