Fix SMS and other tests for v2.1

The second one is to spare...