Cleanups to CircuitBreakerServiceTests