The whole "or a negative test" thing is clearly going away. It was added to make the pill easier to swallow at first; but governments (again, at least in Western Europe) seem to be getting a bit desperate to increase vaccination rates, and are making tests very very cost prohibitive (50€ per test, and you need a new test every 2-3 days), and are likely to remove that option altogether at some point. A pretty obvious slippery slope in hindsight: governments never let a crisis go to waste.