Need to be thoughtful about rolling it out, though, since we'd change semantics on existing tests pretty drastically. Maybe that's fine?