To the OP - Your trip is in August. First piece of advice is to start thinking in dog years - no, COVID years, or, maybe COVID months. I don't know what to call them, but the pandemic has even changed time. That is, August is a long, long time ahead. Stop thinking of things (like time) as we did before, when 5 months ahead of your departure, you could find out the rules and just file that away on your pre-travel task list.
It's not like that any more. Things change, sometimes quickly. Many things will change between now and August. Heck, some things will change in the next week or two. And some things will change more than once, and some might go back to the way they were before they changed.
So, in March, don't worry about what the requirements will be in August. Ask again in July. And then remain flexible, ready to adapt, until you are settled in your airline seat, they close the door on your flight, they push back the plane, and start up the engines. Until then, don't be shocked if the rules change. Once your flight has taken off, the rules probably won't change before you land. Probably.
The thrill of travel during the pandemic times!