Issue #3538637 by dww: Fix problems with UpdateMailTest: only test valid cases, use correct paths, remove dead code