tests and fixes to circuit breaker advice, more tests