What are the re-entry requirements and extension options for US citizens returning to Thailand after a brief trip?

Hello all - need some advice and my apologies if this topic has been addressed.

We are US citizens who arrived in Thailand on April 7th. We stayed until May 5th. We received a 30-day extension until June 5th however we left and spent two weeks in Vietnam.

We are looking to return to Thailand in the next few days. Here are my questions.

1. Do we have to go through the Test and Go program to re-enter the country?

1. When we arrive, we want to extend our stay for another 30 days. I know the COVID extension is going away on May 24th. Is there another way we can apply for a 30-day extension?

1. Do we have to return to the same immigration office to apply for the extension? We did the first one in Chiang Mai.

Thank you