Some changes so tests run against the real services