Fix tests, but still need to maybe stub out email