OK, so I think tests like this one will need to be rewritten: