Fix smtp tests to accept deferred and new param encoding.