Merge "Fix another test" into ub-mail-master