Merge "Fix tests" into ub-mail-master