Fix SMS and other tests for v2.1