Make tests not ISE out, fix UnconfirmedEmailAddresses test