3909 Fix tests and restore change email link
3909 Test fixes