Merge "Fix mailbox finding and unit tests."