Re-commenting out tests that use real services