I definitely think that's possible! I haven't taken the test yet, but in the last month I've gone from getting around 167 to an average in the 170s! The biggest changes I've made (and this might sound kind of ridiculous) are getting at least 8 hours…
I'm not completely sure, but I'm hoping it will be announced by mid July. However, I'm guessing it will be flex because there are a lot of places overrun by covid and some cities (like mine lol) are still on lockdown.