Some changes so tests run against the real services (they do with 2 exceptions involving temp tokens sent to user's email