Fix some more issues following bug 896738 move of the mailTestUtils to a module. rs=jcranmer. Bustage fixes for CLOSED TREE