Oops
Tried to get changeEmail test to work, cleaned a bit.