fix tests using UPN instead of Mail because the office365 account has no exchange anymore
add support for latest WAAD release