Merge "Fix a couple more tests" into ub-mail-master