Yeah, that sounds better. I think it's an artifact of the way the feature evolved. It would be better to rewrite the other tests in the same way.