As above: I think this fits the normal test suite. Should be trivial to convert it