Email verification changed, tests are fixed