Add a TODO to tighten up the contract of some tests