Indeed - its not always easy to tell which tests you'll need in advance. But once you do add them, they're there for good.

And my original "solution" fails on a couple of these as well.

qq