Fix all tests again after e-mail implementation