Merge in tests for SASL